From 5a933364741cd6b7274c24ac5bb767bdf3703616 Mon Sep 17 00:00:00 2001 From: Maria Haider Date: Mon, 7 Mar 2022 14:46:44 +0100 Subject: [PATCH] update db --- global/overlay/etc/puppet/cosmos-db.yaml | 96 +++++++++++++----------- 1 file changed, 54 insertions(+), 42 deletions(-) diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml index 69b72da1..35df2bf0 100644 --- a/global/overlay/etc/puppet/cosmos-db.yaml +++ b/global/overlay/etc/puppet/cosmos-db.yaml @@ -224,11 +224,19 @@ classes: autoupdate: null common: null eid::dockerhost: &id013 {version: '5:20.10.6~3-0~ubuntu-focal'} + eidas_proxy: &id014 {hostname: test.proxy.eidas.swedenconnect.se, spring_config_param: SPRING_CONFIG_ADDITIONAL_LOCATION, + version: 1.4.5_hsm2} entropyclient: null infra_ca_rp: null konsulter: null mailclient: *id001 nrpe: null + servicemonitor: null + sunet::frontend::register_sites: &id015 + sites: + test.proxy.eidas.swedenconnect.se: + frontends: [fe-fre-1.test.komreg.net, fe-tug-1.test.komreg.net] + port: '443' sunet::rsyslog: null sunet::server: *id002 sunet_iaas_cloud: null @@ -252,11 +260,14 @@ classes: autoupdate: null common: null eid::dockerhost: *id013 + eidas_proxy: *id014 entropyclient: null infra_ca_rp: null konsulter: null mailclient: *id001 nrpe: null + servicemonitor: null + sunet::frontend::register_sites: *id015 sunet::rsyslog: null sunet::server: *id002 sunet_iaas_cloud: null @@ -294,7 +305,7 @@ classes: eidas-redis-1.sveidas.se: autoupdate: null common: null - eid::dockerhost: &id014 {version: '5:20.10.8~3-0~ubuntu-bionic'} + eid::dockerhost: &id016 {version: '5:20.10.8~3-0~ubuntu-bionic'} entropyclient: null infra_ca_rp: null mailclient: *id001 @@ -306,7 +317,7 @@ classes: eidas-redis-2.sveidas.se: autoupdate: null common: null - eid::dockerhost: *id014 + eid::dockerhost: *id016 entropyclient: null infra_ca_rp: null mailclient: *id001 @@ -318,7 +329,7 @@ classes: eidas-redis-3.sveidas.se: autoupdate: null common: null - eid::dockerhost: *id014 + eid::dockerhost: *id016 entropyclient: null infra_ca_rp: null mailclient: *id001 @@ -330,7 +341,7 @@ classes: eidas-redis-4.sveidas.se: autoupdate: null common: null - eid::dockerhost: *id014 + eid::dockerhost: *id016 entropyclient: null infra_ca_rp: null mailclient: *id001 @@ -342,38 +353,38 @@ classes: eidas-redis-fe-1.sveidas.se: autoupdate: null common: null - eid::dockerhost: &id015 {version: '5:20.10.8~3-0~ubuntu-bionic'} + eid::dockerhost: &id017 {version: '5:20.10.8~3-0~ubuntu-bionic'} entropyclient: null infra_ca_rp: null mailclient: *id001 nrpe: null - redis_frontend_node: &id016 {hostname: redis.sveidas.se} + redis_frontend_node: &id018 {hostname: redis.sveidas.se} sunet::rsyslog: null sunet::server: *id002 sunetops: null eidas-redis-fe-2.sveidas.se: autoupdate: null common: null - eid::dockerhost: *id015 + eid::dockerhost: *id017 entropyclient: null infra_ca_rp: null mailclient: *id001 nrpe: null - redis_frontend_node: *id016 + redis_frontend_node: *id018 sunet::rsyslog: null sunet::server: *id002 sunetops: null eidas-test-1.sveidas.se: autoupdate: null common: null - eid::dockerhost: &id017 {version: '5:20.10.8~3-0~ubuntu-bionic'} + eid::dockerhost: &id019 {version: '5:20.10.8~3-0~ubuntu-bionic'} entropyclient: null infra_ca_rp: null konsulter: null mailclient: *id001 nrpe: null servicemonitor: null - sunet::frontend::register_sites: &id018 + sunet::frontend::register_sites: &id020 sites: test.swedenconnect.se: frontends: [fe-fre-3.komreg.net, fe-tug-3.komreg.net] @@ -381,22 +392,22 @@ classes: sunet::rsyslog: null sunet::server: *id002 sunetops: null - test_my_eid: &id019 {environment: prod, hostname: test.swedenconnect.se, version: 1.3.1} + test_my_eid: &id021 {environment: prod, hostname: test.swedenconnect.se, version: 1.3.1} eidas-test-2.sveidas.se: autoupdate: null common: null - eid::dockerhost: *id017 + eid::dockerhost: *id019 entropyclient: null infra_ca_rp: null konsulter: null mailclient: *id001 nrpe: null servicemonitor: null - sunet::frontend::register_sites: *id018 + sunet::frontend::register_sites: *id020 sunet::rsyslog: null sunet::server: *id002 sunetops: null - test_my_eid: *id019 + test_my_eid: *id021 eidastest-1.qa.sveidas.se: autoupdate: null common: null @@ -536,7 +547,7 @@ classes: sunetops: null fe-fre-1.test.komreg.net: common: null - eid::dockerhost: &id020 {version: '5:20.10.12~3-0~ubuntu-focal'} + eid::dockerhost: &id022 {version: '5:20.10.12~3-0~ubuntu-focal'} entropyclient: null fe_servers: null infra_ca_rp: null @@ -548,7 +559,7 @@ classes: sunetops: null fe-fre-3.komreg.net: common: null - eid::dockerhost: &id021 {version: '5:20.10.9~3-0~ubuntu-bionic'} + eid::dockerhost: &id023 {version: '5:20.10.9~3-0~ubuntu-bionic'} entropyclient: null fe_servers: null infra_ca_rp: null @@ -560,7 +571,7 @@ classes: sunetops: null fe-tug-1.test.komreg.net: common: null - eid::dockerhost: *id020 + eid::dockerhost: *id022 entropyclient: null fe_servers: null infra_ca_rp: null @@ -572,7 +583,7 @@ classes: sunetops: null fe-tug-3.komreg.net: common: null - eid::dockerhost: *id021 + eid::dockerhost: *id023 entropyclient: null fe_servers: null infra_ca_rp: null @@ -608,7 +619,7 @@ classes: metadatamgrs: null nrpe: null sunet::rsyslog: null - sunet::server: &id022 {ssh_allow_from_anywhere: true} + sunet::server: &id024 {ssh_allow_from_anywhere: true} sunetops: null jump-tug-3.komreg.net: autoupdate: null @@ -621,7 +632,7 @@ classes: metadatamgrs: null nrpe: null sunet::rsyslog: null - sunet::server: *id022 + sunet::server: *id024 sunetops: null kvmdemw-fre-3a.komreg.net: common: null @@ -1319,13 +1330,13 @@ classes: prid-1.sveidas.se: autoupdate: null common: null - eid::dockerhost: &id023 {version: '5:20.10.8~3-0~ubuntu-bionic'} + eid::dockerhost: &id025 {version: '5:20.10.8~3-0~ubuntu-bionic'} entropyclient: null infra_ca_rp: null konsulter: null mailclient: *id001 nrpe: null - prid: &id024 {clients: prid_prod_clients, mdsl: 'https://md.eidas.swedenconnect.se/mdservicelist-aggregate.xml', + prid: &id026 {clients: prid_prod_clients, mdsl: 'https://md.eidas.swedenconnect.se/mdservicelist-aggregate.xml', version: 1.0.4} servicemonitor: null sunet::rsyslog: null @@ -1334,13 +1345,13 @@ classes: prid-2.sveidas.se: autoupdate: null common: null - eid::dockerhost: *id023 + eid::dockerhost: *id025 entropyclient: null infra_ca_rp: null konsulter: null mailclient: *id001 nrpe: null - prid: *id024 + prid: *id026 servicemonitor: null sunet::rsyslog: null sunet::server: *id002 @@ -1420,13 +1431,13 @@ classes: validator-1.komreg.net: autoupdate: null common: null - eid::dockerhost: &id025 {version: '5:20.10.8~3-0~ubuntu-bionic'} + eid::dockerhost: &id027 {version: '5:20.10.8~3-0~ubuntu-bionic'} entropyclient: null infra_ca_rp: null konsulter: null mailclient: *id001 nrpe: null - sunet::frontend::register_sites: &id026 + sunet::frontend::register_sites: &id028 sites: validator.swedenconnect.se: frontends: [fe-fre-3.komreg.net, fe-tug-3.komreg.net] @@ -1434,7 +1445,7 @@ classes: sunet::rsyslog: null sunet::server: *id002 sunetops: null - validator: &id027 {version: 3.0.10} + validator: &id029 {version: 3.0.10} validator-1.qa.komreg.net: autoupdate: null common: null @@ -1457,17 +1468,17 @@ classes: validator-2.komreg.net: autoupdate: null common: null - eid::dockerhost: *id025 + eid::dockerhost: *id027 entropyclient: null infra_ca_rp: null konsulter: null mailclient: *id001 nrpe: null - sunet::frontend::register_sites: *id026 + sunet::frontend::register_sites: *id028 sunet::rsyslog: null sunet::server: *id002 sunetops: null - validator: *id027 + validator: *id029 validator-test-1.komreg.net: autoupdate: null common: null @@ -1595,8 +1606,9 @@ members: natmd-test-1.komreg.net, natmd-test-2.komreg.net] eidas_log: [log-1.sveidas.se, log-1.test.sveidas.se, log-2.sveidas.se, log.qa.sveidas.se] eidas_metadata_key: [md-eu1.qa.komreg.net, md1.komreg.net] - eidas_proxy: [eidas-proxy-1.qa.sveidas.se, eidas-proxy-1.sveidas.se, eidas-proxy-2.sveidas.se, - eidas-proxy-3.sveidas.se, eidas-proxy-4.sveidas.se] + eidas_proxy: [eidas-proxy-1.qa.sveidas.se, eidas-proxy-1.sveidas.se, eidas-proxy-1.test.sveidas.se, + eidas-proxy-2.sveidas.se, eidas-proxy-2.test.sveidas.se, eidas-proxy-3.sveidas.se, + eidas-proxy-4.sveidas.se] eidastest: [eidastest-1.qa.sveidas.se] entropyclient: [demw-1.qa.sveidas.se, demw-1.sveidas.se, demw-2.sveidas.se, eidas-connector-1.sveidas.se, eidas-connector-1.test.sveidas.se, eidas-connector-2.sveidas.se, eidas-connector-2.test.sveidas.se, @@ -1730,10 +1742,10 @@ members: eidas-redis-4.sveidas.se] redis_frontend_node: [eidas-redis-fe-1.sveidas.se, eidas-redis-fe-2.sveidas.se] saml_metadata: [demw-1.qa.sveidas.se, demw-1.sveidas.se, demw-2.sveidas.se] - servicemonitor: [eidas-proxy-1.qa.sveidas.se, eidas-proxy-1.sveidas.se, eidas-proxy-2.sveidas.se, - eidas-proxy-3.sveidas.se, eidas-proxy-4.sveidas.se, eidas-test-1.sveidas.se, eidas-test-2.sveidas.se, - prid-1.qa.sveidas.se, prid-1.sveidas.se, prid-2.sveidas.se, test-1.qa.sveidas.se, - test-1.test.sveidas.se] + servicemonitor: [eidas-proxy-1.qa.sveidas.se, eidas-proxy-1.sveidas.se, eidas-proxy-1.test.sveidas.se, + eidas-proxy-2.sveidas.se, eidas-proxy-2.test.sveidas.se, eidas-proxy-3.sveidas.se, + eidas-proxy-4.sveidas.se, eidas-test-1.sveidas.se, eidas-test-2.sveidas.se, prid-1.qa.sveidas.se, + prid-1.sveidas.se, prid-2.sveidas.se, test-1.qa.sveidas.se, test-1.test.sveidas.se] site_alias: [web-1.qa.sveidas.se] sunet::auditd: [jmp.komreg.net] sunet::frontend::load_balancer: [fe-fre-1.test.komreg.net, fe-fre-3.komreg.net, @@ -1742,12 +1754,12 @@ members: eidas-connector-1.sveidas.se, eidas-connector-1.test.sveidas.se, eidas-connector-2.sveidas.se, eidas-connector-2.test.sveidas.se, eidas-connector-3.sveidas.se, eidas-connector-4.sveidas.se, eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se, eidas-proxy-1.sveidas.se, - eidas-proxy-2.sveidas.se, eidas-proxy-3.sveidas.se, eidas-proxy-4.sveidas.se, - eidas-test-1.sveidas.se, eidas-test-2.sveidas.se, eidastest-1.qa.sveidas.se, eupub-1.komreg.net, - eupub-2.komreg.net, natpub-1.komreg.net, natpub-2.komreg.net, natpub-test-2.komreg.net, - p1.komreg.net, p2.qa.komreg.net, refidp-1.qa.sveidas.se, test-1.qa.sveidas.se, - test-1.test.sveidas.se, validator-1.komreg.net, validator-1.qa.komreg.net, validator-2.komreg.net, - web-1.qa.sveidas.se] + eidas-proxy-1.test.sveidas.se, eidas-proxy-2.sveidas.se, eidas-proxy-2.test.sveidas.se, + eidas-proxy-3.sveidas.se, eidas-proxy-4.sveidas.se, eidas-test-1.sveidas.se, eidas-test-2.sveidas.se, + eidastest-1.qa.sveidas.se, eupub-1.komreg.net, eupub-2.komreg.net, natpub-1.komreg.net, + natpub-2.komreg.net, natpub-test-2.komreg.net, p1.komreg.net, p2.qa.komreg.net, + refidp-1.qa.sveidas.se, test-1.qa.sveidas.se, test-1.test.sveidas.se, validator-1.komreg.net, + validator-1.qa.komreg.net, validator-2.komreg.net, web-1.qa.sveidas.se] sunet::fticks: [log.qa.sveidas.se] sunet::nagiosapi: [nic.komreg.net] sunet::rsyslog: [demw-1.qa.sveidas.se, demw-1.sveidas.se, demw-2.sveidas.se, eidas-connector-1.sveidas.se,