swedenconnect/eid-ops
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of gitops.sunet.se:eid-ops

Browse source
This commit is contained in:
Erik Bergström 2023-12-20 12:36:48 +01:00
commit 3a94a83702
No known key found for this signature in database
GPG key ID: 49A4251C96E0A9D4
4 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
global/overlay/etc/hiera/data/common.yaml
View file

@ -142,7 +142,6 @@ sunetops_ssh_keys:
metadatamgrs_ssh_keys: metadatamgrs_ssh_keys:
'root': 'root':
- 'jocar'
konsulter_ssh_keys: konsulter_ssh_keys:
'root': 'root':

3
global/overlay/etc/puppet/cosmos-db.yaml
View file

@ -1078,7 +1078,8 @@ classes:
natmd-test-1.komreg.net: natmd-test-1.komreg.net:
autoupdate: null autoupdate: null
common: null common: null
eid::dockerhost: {storage_driver: overlay2, version: '5:24.0.7-1~ubuntu.20.04~focal'} eid::dockerhost: {storage_driver: overlay2, version: '5:24.0.7-1~ubuntu.20.04~focal',
write_daemon_config: true}
entropyclient: null entropyclient: null
infra_ca_rp: null infra_ca_rp: null
konsulter: null konsulter: null

1
global/overlay/etc/puppet/cosmos-rules.yaml
View file

@ -470,6 +470,7 @@ natmd-test-1.komreg.net:
eid::dockerhost: eid::dockerhost:
version: '5:24.0.7-1~ubuntu.20.04~focal' version: '5:24.0.7-1~ubuntu.20.04~focal'
storage_driver: 'overlay2' storage_driver: 'overlay2'
write_daemon_config: true
metadatamgrs: metadatamgrs:
konsulter: konsulter:
sunet::metadata::pyff_compose: sunet::metadata::pyff_compose:

7
global/overlay/etc/puppet/manifests/cosmos-site.pp
View file

@ -807,13 +807,6 @@ class metadatamgrs {
key => 'AAAAB3NzaC1yc2EAAAADAQABAAACAQDwAmCtqutG+WF2eqqYn+eXwLi1VoNm8TgR/IyNwgf5CP4Pi0K2XxZu2ntFUtOM4Ht5Sf/rD8Y6tFypNYzupMpCqvmub4VA8joGivChc44JuNHylYNvLdaRK3AKdL4Qpr+F6r3YCNGO4xHYbZOG9/JKFcBpFot3ggq96LIp+DpBHXYwQJ3wSjHDPX5xlTjAmgQ0dsBRQoEWIb1EZ7omBMk+e6B7nv9FfQ+kU7qk8p0qMInwUuaFj6P8OAKHQXC1ZmMBX2BKClxjR5wnOtmCTRz6ACDweyC5GK0RyCC0/jGhPkWnodskiCeOXpcnJF8a0gCvrfFdfg9oFHaKZwgjRKeyEWIOnhbiKdEDrnEvSX5OlRuKfaqhOYgsmRFwmOtPH3PKbymybs2KkesiZDJr1KCWwSXd/Bz7EivRX0nLDHEAMi+EASqUc99RtMWc31rYVHDmtPhXVGpqmLYIwODyC87dxKR+vBx6hbTdlIXLntKbipmSct/Y3EvdSpcNw5AFYPvPexfeF+C3ocIGtNgWsawadkMF+MDVSbU443VLvRprARaDfInyswKjqHWVuosXzWYS2rUAFX3NAnw7jAtvjfCswebiXTQwanQz6UhPl5w8tyze0LqTbiRTf+rKDwc1F6h+mv6zvHODYu2Kj+YnkEGO9vVEjPB+o1Jw2oLkawXlcQ==', key => 'AAAAB3NzaC1yc2EAAAADAQABAAACAQDwAmCtqutG+WF2eqqYn+eXwLi1VoNm8TgR/IyNwgf5CP4Pi0K2XxZu2ntFUtOM4Ht5Sf/rD8Y6tFypNYzupMpCqvmub4VA8joGivChc44JuNHylYNvLdaRK3AKdL4Qpr+F6r3YCNGO4xHYbZOG9/JKFcBpFot3ggq96LIp+DpBHXYwQJ3wSjHDPX5xlTjAmgQ0dsBRQoEWIb1EZ7omBMk+e6B7nv9FfQ+kU7qk8p0qMInwUuaFj6P8OAKHQXC1ZmMBX2BKClxjR5wnOtmCTRz6ACDweyC5GK0RyCC0/jGhPkWnodskiCeOXpcnJF8a0gCvrfFdfg9oFHaKZwgjRKeyEWIOnhbiKdEDrnEvSX5OlRuKfaqhOYgsmRFwmOtPH3PKbymybs2KkesiZDJr1KCWwSXd/Bz7EivRX0nLDHEAMi+EASqUc99RtMWc31rYVHDmtPhXVGpqmLYIwODyC87dxKR+vBx6hbTdlIXLntKbipmSct/Y3EvdSpcNw5AFYPvPexfeF+C3ocIGtNgWsawadkMF+MDVSbU443VLvRprARaDfInyswKjqHWVuosXzWYS2rUAFX3NAnw7jAtvjfCswebiXTQwanQz6UhPl5w8tyze0LqTbiRTf+rKDwc1F6h+mv6zvHODYu2Kj+YnkEGO9vVEjPB+o1Jw2oLkawXlcQ==',
user => 'root' user => 'root'
} }
ssh_authorized_key {'jocar':
ensure => present,
name => 'jocar@sunet.se',
type => 'ssh-rsa',
key => 'AAAAB3NzaC1yc2EAAAADAQABAAACAQDNkmMZWjsa2oZfIsK+8wO0w8MgMa1aWUOZXahgj7Jg+CBSxY3eXNa8BRoT9gvHEWSdT9N6AIY0IxCiDs0KZmB4CV/k532cMAs5q22T9U1jLEP8FA6zXVoyEGvhY/v5aRpoCOEwZpHCRp04xEiEtw4ymXA0JnI6/2Yp+m2wdhkyYBjrv/xCeoeIhjtMHaVQlMwl/LLSRaaD3YRc9g8WmnntZpsz2BIDMGLhI8QF/reF+l8BFNAyHQbuFhkfQgmNra3KsAqNIwV2bMZRje+TnTzeERjGxeM/kOhYBEulVdfxUOVFE3pDzTG1U8srVdic49+PlfhoFJRLNo+TATkXbJuHKCJA4kjDv7Fw32Y7d6prEahqH/8VdAsjmv2a66BABj/5Yl/pp6mDCA+Xy667Asgk6qKKH5NAeqHSQx7s6+TgitXUMZn6/Se6+l1Wd43iVK+N58xK2MMA8lANaSYddTJ4k8wFEFdYjjaxGqPOEE2ztKFAZTp5nBi8jRxLZ1mfLXZxru8HPVmCSPxx+/4bZe3zyMPHGqb8fEc/nuNkdnogo4opXX2w64mAiFJZftWQ+k5VigT1l9DUN0I7wO7pRI08So8W8/biUmoao+0DgI3kXW9PClEcz0QcbvOCQeVlNE2UowCmiKZ/Otgm3VTGy9ykI7iYbw+5UZs4Z0Ap++dHAQ==',
user => 'root'
}
} }
class konsulter { class konsulter {