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:
Fredrik Kjellman 2023-05-15 13:59:22 +02:00
commit 4175310dc3
2 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -235,7 +235,7 @@ classes:
eidas-proxy-1.test.sveidas.se: eidas-proxy-1.test.sveidas.se:
autoupdate: null autoupdate: null
common: null common: null
eid::dockerhost: &id013 {version: '5:20.10.6~3-0~ubuntu-focal'} eid::dockerhost: &id013 {version: '5:23.0.6-1~ubuntu.20.04~focal'}
eid::telegraf: null eid::telegraf: null
eidas_proxy: &id014 {hostname: test.proxy.eidas.swedenconnect.se, spring_config_param: SPRING_CONFIG_ADDITIONAL_LOCATION, eidas_proxy: &id014 {hostname: test.proxy.eidas.swedenconnect.se, spring_config_param: SPRING_CONFIG_ADDITIONAL_LOCATION,
version: 1.4.7_hsm2_ubuntu} version: 1.4.7_hsm2_ubuntu}
@ -476,7 +476,7 @@ classes:
eumd-test-1.komreg.net: eumd-test-1.komreg.net:
autoupdate: null autoupdate: null
common: null common: null
eid::dockerhost: {version: '5:20.10.6~3-0~ubuntu-focal'} eid::dockerhost: {version: '5:23.0.6-1~ubuntu.20.04~focal'}
eidas_hsm_client: null eidas_hsm_client: null
entropyclient: null entropyclient: null
infra_ca_rp: null infra_ca_rp: null
@ -492,7 +492,7 @@ classes:
eumd-test-2.komreg.net: eumd-test-2.komreg.net:
autoupdate: null autoupdate: null
common: null common: null
eid::dockerhost: {version: '5:20.10.6~3-0~ubuntu-focal'} eid::dockerhost: {version: '5:23.0.6-1~ubuntu.20.04~focal'}
eidas_hsm_client: null eidas_hsm_client: null
entropyclient: null entropyclient: null
infra_ca_rp: null infra_ca_rp: null
@ -575,7 +575,7 @@ classes:
sunetops: null sunetops: null
fe-fre-1.test.komreg.net: fe-fre-1.test.komreg.net:
common: null common: null
eid::dockerhost: &id022 {version: '5:23.0.1-1~ubuntu.20.04~focal'} eid::dockerhost: &id022 {version: '5:23.0.6-1~ubuntu.20.04~focal'}
entropyclient: null entropyclient: null
fe_servers: null fe_servers: null
infra_ca_rp: null infra_ca_rp: null
@ -1113,7 +1113,7 @@ classes:
md-eu1.qa.komreg.net: md-eu1.qa.komreg.net:
autoupdate: null autoupdate: null
common: null common: null
eid::dockerhost: {version: '5:20.10.7~3-0~ubuntu-bionic'} eid::dockerhost: {version: '5:23.0.6-1~ubuntu.20.04~focal'}
eidas_metadata_key: null eidas_metadata_key: null
entropyclient: null entropyclient: null
infra_ca_rp: null infra_ca_rp: null
@ -1202,7 +1202,7 @@ classes:
natmd-test-1.komreg.net: natmd-test-1.komreg.net:
autoupdate: null autoupdate: null
common: null common: null
eid::dockerhost: {version: '5:20.10.6~3-0~ubuntu-focal'} eid::dockerhost: {version: '5:23.0.6-1~ubuntu.20.04~focal'}
eidas_hsm_client: null eidas_hsm_client: null
entropyclient: null entropyclient: null
infra_ca_rp: null infra_ca_rp: null
@ -1218,7 +1218,7 @@ classes:
natmd-test-2.komreg.net: natmd-test-2.komreg.net:
autoupdate: null autoupdate: null
common: null common: null
eid::dockerhost: {version: '5:20.10.6~3-0~ubuntu-focal'} eid::dockerhost: {version: '5:23.0.6-1~ubuntu.20.04~focal'}
eidas_hsm_client: null eidas_hsm_client: null
entropyclient: null entropyclient: null
infra_ca_rp: null infra_ca_rp: null
@ -1463,7 +1463,7 @@ classes:
test-1.test.sveidas.se: test-1.test.sveidas.se:
autoupdate: null autoupdate: null
common: null common: null
eid::dockerhost: {version: '5:20.10.6~3-0~ubuntu-focal'} eid::dockerhost: {version: '5:23.0.6-1~ubuntu.20.04~focal'}
entropyclient: null entropyclient: null
infra_ca_rp: null infra_ca_rp: null
konsulter: null konsulter: null
@ -1533,7 +1533,7 @@ classes:
validator-test-1.komreg.net: validator-test-1.komreg.net:
autoupdate: null autoupdate: null
common: null common: null
eid::dockerhost: {version: '5:20.10.6~3-0~ubuntu-focal'} eid::dockerhost: {version: '5:23.0.6-1~ubuntu.20.04~focal'}
entropyclient: null entropyclient: null
infra_ca_rp: null infra_ca_rp: null
konsulter: null konsulter: null

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

@ -504,7 +504,7 @@ natmd-1.komreg.net:
natmd-test-1.komreg.net: natmd-test-1.komreg.net:
autoupdate: autoupdate:
eid::dockerhost: eid::dockerhost:
version: '5:20.10.6~3-0~ubuntu-focal' version: '5:23.0.6-1~ubuntu.20.04~focal'
metadatamgrs: metadatamgrs:
konsulter: konsulter:
eidas_hsm_client: eidas_hsm_client:
@ -530,7 +530,7 @@ eumd-1.komreg.net:
eumd-test-1.komreg.net: eumd-test-1.komreg.net:
autoupdate: autoupdate:
eid::dockerhost: eid::dockerhost:
version: '5:20.10.6~3-0~ubuntu-focal' version: '5:23.0.6-1~ubuntu.20.04~focal'
metadatamgrs: metadatamgrs:
konsulter: konsulter:
md_repo_client: md_repo_client:
@ -610,7 +610,7 @@ natmd-2.komreg.net:
natmd-test-2.komreg.net: natmd-test-2.komreg.net:
autoupdate: autoupdate:
eid::dockerhost: eid::dockerhost:
version: '5:20.10.6~3-0~ubuntu-focal' version: '5:23.0.6-1~ubuntu.20.04~focal'
md_signer: md_signer:
name: natmd-test name: natmd-test
dest_host: natpub-test-2.komreg.net dest_host: natpub-test-2.komreg.net
@ -636,7 +636,7 @@ eumd-2.komreg.net:
eumd-test-2.komreg.net: eumd-test-2.komreg.net:
autoupdate: autoupdate:
eid::dockerhost: eid::dockerhost:
version: '5:20.10.6~3-0~ubuntu-focal' version: '5:23.0.6-1~ubuntu.20.04~focal'
metadatamgrs: metadatamgrs:
konsulter: konsulter:
md_repo_client: md_repo_client:
@ -771,7 +771,7 @@ md-eu1.qa.komreg.net:
dest_host: p2.qa.komreg.net dest_host: p2.qa.komreg.net
version: 1.1.5-eidas version: 1.1.5-eidas
eid::dockerhost: eid::dockerhost:
version: '5:20.10.7~3-0~ubuntu-bionic' version: '5:23.0.6-1~ubuntu.20.04~focal'
md_repo_client: md_repo_client:
'^test-[0-9]+\.qa\.sveidas\.se$': '^test-[0-9]+\.qa\.sveidas\.se$':
@ -794,7 +794,7 @@ md-eu1.qa.komreg.net:
test-1.test.sveidas.se: test-1.test.sveidas.se:
sunet_iaas_cloud: sunet_iaas_cloud:
eid::dockerhost: eid::dockerhost:
version: '5:20.10.6~3-0~ubuntu-focal' version: '5:23.0.6-1~ubuntu.20.04~focal'
konsulter: konsulter:
autoupdate: autoupdate:
test_my_eid: test_my_eid:
@ -968,7 +968,7 @@ demw-2.sveidas.se:
validator-test-1.komreg.net: validator-test-1.komreg.net:
eid::dockerhost: eid::dockerhost:
version: '5:20.10.6~3-0~ubuntu-focal' version: '5:23.0.6-1~ubuntu.20.04~focal'
konsulter: konsulter:
autoupdate: autoupdate:
validator: validator:
@ -1095,7 +1095,7 @@ log-1.sveidas.se:
'^eidas-proxy-[0-9]+\.test\.sveidas\.se$': '^eidas-proxy-[0-9]+\.test\.sveidas\.se$':
sunet_iaas_cloud: sunet_iaas_cloud:
eid::dockerhost: eid::dockerhost:
version: '5:20.10.6~3-0~ubuntu-focal' version: '5:23.0.6-1~ubuntu.20.04~focal'
eid::telegraf: eid::telegraf:
konsulter: konsulter:
autoupdate: autoupdate:
@ -1148,7 +1148,7 @@ log-1.sveidas.se:
'^fe-.+-\d+\.test\.komreg\.net$': '^fe-.+-\d+\.test\.komreg\.net$':
eid::dockerhost: eid::dockerhost:
version: '5:23.0.1-1~ubuntu.20.04~focal' version: '5:23.0.6-1~ubuntu.20.04~focal'
sunet::frontend::load_balancer: sunet::frontend::load_balancer:
fe_servers: fe_servers: