From 946ec16fcaa141bc2b82a5cfeb72ba63aa216a5b Mon Sep 17 00:00:00 2001 From: Maria Haider Date: Mon, 15 May 2023 13:55:29 +0200 Subject: [PATCH 1/2] upgraded docker-ce --- global/overlay/etc/puppet/cosmos-rules.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml index 1e925d0a..ea11cb8a 100644 --- a/global/overlay/etc/puppet/cosmos-rules.yaml +++ b/global/overlay/etc/puppet/cosmos-rules.yaml @@ -504,7 +504,7 @@ natmd-1.komreg.net: natmd-test-1.komreg.net: autoupdate: eid::dockerhost: - version: '5:20.10.6~3-0~ubuntu-focal' + version: '5:23.0.6-1~ubuntu.20.04~focal' metadatamgrs: konsulter: eidas_hsm_client: @@ -530,7 +530,7 @@ eumd-1.komreg.net: eumd-test-1.komreg.net: autoupdate: eid::dockerhost: - version: '5:20.10.6~3-0~ubuntu-focal' + version: '5:23.0.6-1~ubuntu.20.04~focal' metadatamgrs: konsulter: md_repo_client: @@ -610,7 +610,7 @@ natmd-2.komreg.net: natmd-test-2.komreg.net: autoupdate: eid::dockerhost: - version: '5:20.10.6~3-0~ubuntu-focal' + version: '5:23.0.6-1~ubuntu.20.04~focal' md_signer: name: natmd-test dest_host: natpub-test-2.komreg.net @@ -636,7 +636,7 @@ eumd-2.komreg.net: eumd-test-2.komreg.net: autoupdate: eid::dockerhost: - version: '5:20.10.6~3-0~ubuntu-focal' + version: '5:23.0.6-1~ubuntu.20.04~focal' metadatamgrs: konsulter: md_repo_client: @@ -771,7 +771,7 @@ md-eu1.qa.komreg.net: dest_host: p2.qa.komreg.net version: 1.1.5-eidas eid::dockerhost: - version: '5:20.10.7~3-0~ubuntu-bionic' + version: '5:23.0.6-1~ubuntu.20.04~focal' md_repo_client: '^test-[0-9]+\.qa\.sveidas\.se$': @@ -794,7 +794,7 @@ md-eu1.qa.komreg.net: test-1.test.sveidas.se: sunet_iaas_cloud: eid::dockerhost: - version: '5:20.10.6~3-0~ubuntu-focal' + version: '5:23.0.6-1~ubuntu.20.04~focal' konsulter: autoupdate: test_my_eid: @@ -968,7 +968,7 @@ demw-2.sveidas.se: validator-test-1.komreg.net: eid::dockerhost: - version: '5:20.10.6~3-0~ubuntu-focal' + version: '5:23.0.6-1~ubuntu.20.04~focal' konsulter: autoupdate: validator: @@ -1095,7 +1095,7 @@ log-1.sveidas.se: '^eidas-proxy-[0-9]+\.test\.sveidas\.se$': sunet_iaas_cloud: eid::dockerhost: - version: '5:20.10.6~3-0~ubuntu-focal' + version: '5:23.0.6-1~ubuntu.20.04~focal' eid::telegraf: konsulter: autoupdate: @@ -1148,7 +1148,7 @@ log-1.sveidas.se: '^fe-.+-\d+\.test\.komreg\.net$': 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: fe_servers: From 9d9e57886b42ca56bf7d03a2c4b2a5257755b447 Mon Sep 17 00:00:00 2001 From: Maria Haider Date: Mon, 15 May 2023 13:55:34 +0200 Subject: [PATCH 2/2] update db --- global/overlay/etc/puppet/cosmos-db.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml index 207391e2..b0706ffe 100644 --- a/global/overlay/etc/puppet/cosmos-db.yaml +++ b/global/overlay/etc/puppet/cosmos-db.yaml @@ -235,7 +235,7 @@ classes: eidas-proxy-1.test.sveidas.se: autoupdate: 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 eidas_proxy: &id014 {hostname: test.proxy.eidas.swedenconnect.se, spring_config_param: SPRING_CONFIG_ADDITIONAL_LOCATION, version: 1.4.7_hsm2_ubuntu} @@ -476,7 +476,7 @@ classes: eumd-test-1.komreg.net: autoupdate: 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 entropyclient: null infra_ca_rp: null @@ -492,7 +492,7 @@ classes: eumd-test-2.komreg.net: autoupdate: 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 entropyclient: null infra_ca_rp: null @@ -575,7 +575,7 @@ classes: sunetops: null fe-fre-1.test.komreg.net: 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 fe_servers: null infra_ca_rp: null @@ -1113,7 +1113,7 @@ classes: md-eu1.qa.komreg.net: autoupdate: 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 entropyclient: null infra_ca_rp: null @@ -1202,7 +1202,7 @@ classes: natmd-test-1.komreg.net: autoupdate: 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 entropyclient: null infra_ca_rp: null @@ -1218,7 +1218,7 @@ classes: natmd-test-2.komreg.net: autoupdate: 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 entropyclient: null infra_ca_rp: null @@ -1463,7 +1463,7 @@ classes: test-1.test.sveidas.se: autoupdate: 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 infra_ca_rp: null konsulter: null @@ -1533,7 +1533,7 @@ classes: validator-test-1.komreg.net: autoupdate: 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 infra_ca_rp: null konsulter: null