From 3474084430dd701c9b37a3f5b0ad5f8bf1595b97 Mon Sep 17 00:00:00 2001 From: Maria Haider Date: Thu, 23 Sep 2021 12:07:10 +0200 Subject: [PATCH] update db --- global/overlay/etc/puppet/cosmos-db.yaml | 125 ++++++++++++----------- 1 file changed, 63 insertions(+), 62 deletions(-) diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml index 72fd76b6..95a1da99 100644 --- a/global/overlay/etc/puppet/cosmos-db.yaml +++ b/global/overlay/etc/puppet/cosmos-db.yaml @@ -66,14 +66,14 @@ classes: eidas-connector-1.sveidas.se: autoupdate: null common: null - eid::dockerhost: null - eidas_connector: &id003 {hostname: connector.eidas.swedenconnect.se, version: 1.6.7} + eid::dockerhost: &id003 {version: '5:20.10.8~3-0~ubuntu-bionic'} + eidas_connector: &id004 {hostname: connector.eidas.swedenconnect.se, version: 1.6.7} entropyclient: null infra_ca_rp: null konsulter: null mailclient: *id001 nrpe: null - sunet::frontend::register_sites: &id004 + sunet::frontend::register_sites: &id005 sites: connector.eidas.swedenconnect.se: frontends: [fe-fre-3.komreg.net, fe-tug-3.komreg.net] @@ -84,14 +84,14 @@ classes: eidas-connector-1.test.sveidas.se: autoupdate: null common: null - eid::dockerhost: &id005 {version: '5:20.10.6~3-0~ubuntu-focal'} - eidas_connector: &id006 {hostname: test.connector.eidas.swedenconnect.se, version: 1.6.7} + eid::dockerhost: &id006 {version: '5:20.10.6~3-0~ubuntu-focal'} + eidas_connector: &id007 {hostname: test.connector.eidas.swedenconnect.se, version: 1.6.7} entropyclient: null infra_ca_rp: null konsulter: null mailclient: *id001 nrpe: null - sunet::frontend::register_sites: &id007 + sunet::frontend::register_sites: &id008 sites: test.connector.eidas.swedenconnect.se: frontends: [se-fre-lb-1.sunet.se, se-tug-lb-1.sunet.se] @@ -103,28 +103,28 @@ classes: eidas-connector-2.sveidas.se: autoupdate: null common: null - eid::dockerhost: null - eidas_connector: *id003 + eid::dockerhost: *id003 + eidas_connector: *id004 entropyclient: null infra_ca_rp: null konsulter: null mailclient: *id001 nrpe: null - sunet::frontend::register_sites: *id004 + sunet::frontend::register_sites: *id005 sunet::rsyslog: null sunet::server: *id002 sunetops: null eidas-connector-2.test.sveidas.se: autoupdate: null common: null - eid::dockerhost: *id005 - eidas_connector: *id006 + eid::dockerhost: *id006 + eidas_connector: *id007 entropyclient: null infra_ca_rp: null konsulter: null mailclient: *id001 nrpe: null - sunet::frontend::register_sites: *id007 + sunet::frontend::register_sites: *id008 sunet::rsyslog: null sunet::server: *id002 sunet_iaas_cloud: null @@ -132,28 +132,28 @@ classes: eidas-connector-3.sveidas.se: autoupdate: null common: null - eid::dockerhost: null - eidas_connector: *id003 + eid::dockerhost: *id003 + eidas_connector: *id004 entropyclient: null infra_ca_rp: null konsulter: null mailclient: *id001 nrpe: null - sunet::frontend::register_sites: *id004 + sunet::frontend::register_sites: *id005 sunet::rsyslog: null sunet::server: *id002 sunetops: null eidas-connector-4.sveidas.se: autoupdate: null common: null - eid::dockerhost: null - eidas_connector: *id003 + eid::dockerhost: *id003 + eidas_connector: *id004 entropyclient: null infra_ca_rp: null konsulter: null mailclient: *id001 nrpe: null - sunet::frontend::register_sites: *id004 + sunet::frontend::register_sites: *id005 sunet::rsyslog: null sunet::server: *id002 sunetops: null @@ -200,8 +200,8 @@ classes: eidas-proxy-1.sveidas.se: autoupdate: null common: null - eid::dockerhost: &id008 {version: '5:20.10.8~3-0~ubuntu-bionic'} - eidas_proxy: &id009 {hostname: proxy.eidas.swedenconnect.se, spring_config_param: SPRING_CONFIG_ADDITIONAL_LOCATION, + eid::dockerhost: &id009 {version: '5:20.10.8~3-0~ubuntu-bionic'} + eidas_proxy: &id010 {hostname: proxy.eidas.swedenconnect.se, spring_config_param: SPRING_CONFIG_ADDITIONAL_LOCATION, version: 1.3.5} entropyclient: null infra_ca_rp: null @@ -209,7 +209,7 @@ classes: mailclient: *id001 nrpe: null servicemonitor: null - sunet::frontend::register_sites: &id010 + sunet::frontend::register_sites: &id011 sites: proxy.eidas.swedenconnect.se: frontends: [fe-fre-3.komreg.net, fe-tug-3.komreg.net] @@ -220,7 +220,7 @@ classes: eidas-proxy-1.test.sveidas.se: autoupdate: null common: null - eid::dockerhost: &id011 {version: '5:20.10.6~3-0~ubuntu-focal'} + eid::dockerhost: &id012 {version: '5:20.10.6~3-0~ubuntu-focal'} entropyclient: null infra_ca_rp: null konsulter: null @@ -233,22 +233,22 @@ classes: eidas-proxy-2.sveidas.se: autoupdate: null common: null - eid::dockerhost: *id008 - eidas_proxy: *id009 + eid::dockerhost: *id009 + eidas_proxy: *id010 entropyclient: null infra_ca_rp: null konsulter: null mailclient: *id001 nrpe: null servicemonitor: null - sunet::frontend::register_sites: *id010 + sunet::frontend::register_sites: *id011 sunet::rsyslog: null sunet::server: *id002 sunetops: null eidas-proxy-2.test.sveidas.se: autoupdate: null common: null - eid::dockerhost: *id011 + eid::dockerhost: *id012 entropyclient: null infra_ca_rp: null konsulter: null @@ -261,37 +261,37 @@ classes: eidas-proxy-3.sveidas.se: autoupdate: null common: null - eid::dockerhost: *id008 - eidas_proxy: *id009 + eid::dockerhost: *id009 + eidas_proxy: *id010 entropyclient: null infra_ca_rp: null konsulter: null mailclient: *id001 nrpe: null servicemonitor: null - sunet::frontend::register_sites: *id010 + sunet::frontend::register_sites: *id011 sunet::rsyslog: null sunet::server: *id002 sunetops: null eidas-proxy-4.sveidas.se: autoupdate: null common: null - eid::dockerhost: *id008 - eidas_proxy: *id009 + eid::dockerhost: *id009 + eidas_proxy: *id010 entropyclient: null infra_ca_rp: null konsulter: null mailclient: *id001 nrpe: null servicemonitor: null - sunet::frontend::register_sites: *id010 + sunet::frontend::register_sites: *id011 sunet::rsyslog: null sunet::server: *id002 sunetops: null eidas-redis-1.sveidas.se: autoupdate: null common: null - eid::dockerhost: &id012 {version: '5:20.10.8~3-0~ubuntu-bionic'} + eid::dockerhost: &id013 {version: '5:20.10.8~3-0~ubuntu-bionic'} entropyclient: null infra_ca_rp: null mailclient: *id001 @@ -303,7 +303,7 @@ classes: eidas-redis-2.sveidas.se: autoupdate: null common: null - eid::dockerhost: *id012 + eid::dockerhost: *id013 entropyclient: null infra_ca_rp: null mailclient: *id001 @@ -315,7 +315,7 @@ classes: eidas-redis-3.sveidas.se: autoupdate: null common: null - eid::dockerhost: *id012 + eid::dockerhost: *id013 entropyclient: null infra_ca_rp: null mailclient: *id001 @@ -327,7 +327,7 @@ classes: eidas-redis-4.sveidas.se: autoupdate: null common: null - eid::dockerhost: *id012 + eid::dockerhost: *id013 entropyclient: null infra_ca_rp: null mailclient: *id001 @@ -339,38 +339,38 @@ classes: eidas-redis-fe-1.sveidas.se: autoupdate: null common: null - eid::dockerhost: &id013 {version: '5:20.10.8~3-0~ubuntu-bionic'} + eid::dockerhost: &id014 {version: '5:20.10.8~3-0~ubuntu-bionic'} entropyclient: null infra_ca_rp: null mailclient: *id001 nrpe: null - redis_frontend_node: &id014 {hostname: redis.sveidas.se} + redis_frontend_node: &id015 {hostname: redis.sveidas.se} sunet::rsyslog: null sunet::server: *id002 sunetops: null eidas-redis-fe-2.sveidas.se: autoupdate: null common: null - eid::dockerhost: *id013 + eid::dockerhost: *id014 entropyclient: null infra_ca_rp: null mailclient: *id001 nrpe: null - redis_frontend_node: *id014 + redis_frontend_node: *id015 sunet::rsyslog: null sunet::server: *id002 sunetops: null eidas-test-1.sveidas.se: autoupdate: null common: null - eid::dockerhost: &id015 {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 konsulter: null mailclient: *id001 nrpe: null servicemonitor: null - sunet::frontend::register_sites: &id016 + sunet::frontend::register_sites: &id017 sites: test.swedenconnect.se: frontends: [fe-fre-3.komreg.net, fe-tug-3.komreg.net] @@ -378,22 +378,22 @@ classes: sunet::rsyslog: null sunet::server: *id002 sunetops: null - test_my_eid: &id017 {environment: prod, hostname: test.swedenconnect.se, version: 1.3.1} + test_my_eid: &id018 {environment: prod, hostname: test.swedenconnect.se, version: 1.3.1} eidas-test-2.sveidas.se: autoupdate: null common: null - eid::dockerhost: *id015 + eid::dockerhost: *id016 entropyclient: null infra_ca_rp: null konsulter: null mailclient: *id001 nrpe: null servicemonitor: null - sunet::frontend::register_sites: *id016 + sunet::frontend::register_sites: *id017 sunet::rsyslog: null sunet::server: *id002 sunetops: null - test_my_eid: *id017 + test_my_eid: *id018 eidastest-1.qa.sveidas.se: autoupdate: null common: null @@ -529,7 +529,7 @@ classes: metadatamgrs: null nrpe: null sunet::rsyslog: null - sunet::server: &id018 {ssh_allow_from_anywhere: true} + sunet::server: &id019 {ssh_allow_from_anywhere: true} sunetops: null jump-tug-3.komreg.net: autoupdate: null @@ -542,7 +542,7 @@ classes: metadatamgrs: null nrpe: null sunet::rsyslog: null - sunet::server: *id018 + sunet::server: *id019 sunetops: null kvmdemw-fre-3a.komreg.net: common: null @@ -689,6 +689,7 @@ classes: cpus: '8' description: eid connector gateway: 94.176.224.1 + image_url: https://cloud-images.ubuntu.com/bionic/current/bionic-server-cloudimg-amd64.img ip: 94.176.224.5 mac: '52:54:20:02:04:01' memory: '8192' @@ -918,7 +919,7 @@ classes: log-1.sveidas.se: autoupdate: null common: null - eid::dockerhost: &id019 {version: '5:20.10.8~3-0~ubuntu-bionic'} + eid::dockerhost: &id020 {version: '5:20.10.8~3-0~ubuntu-bionic'} eid::telegraf: null eidas_log: null entropyclient: null @@ -926,7 +927,7 @@ classes: konsulter: null mailclient: *id001 nrpe: null - sunet::rsyslog: &id020 {udp_client: 94.176.224.0/24, udp_port: 514} + sunet::rsyslog: &id021 {udp_client: 94.176.224.0/24, udp_port: 514} sunet::server: *id002 sunetops: null log-1.test.sveidas.se: @@ -946,7 +947,7 @@ classes: log-2.sveidas.se: autoupdate: null common: null - eid::dockerhost: *id019 + eid::dockerhost: *id020 eid::telegraf: null eidas_log: null entropyclient: null @@ -954,7 +955,7 @@ classes: konsulter: null mailclient: *id001 nrpe: null - sunet::rsyslog: *id020 + sunet::rsyslog: *id021 sunet::server: *id002 sunetops: null log.qa.sveidas.se: @@ -1169,7 +1170,7 @@ classes: konsulter: null mailclient: *id001 nrpe: null - prid: &id021 {clients: prid_prod_clients, mdsl: 'https://md.eidas.swedenconnect.se/mdservicelist-aggregate.xml', + prid: &id022 {clients: prid_prod_clients, mdsl: 'https://md.eidas.swedenconnect.se/mdservicelist-aggregate.xml', version: 1.0.4} servicemonitor: null sunet::rsyslog: null @@ -1178,7 +1179,7 @@ classes: prid-1.test.sveidas.se: autoupdate: null common: null - eid::dockerhost: &id022 {version: '5:20.10.6~3-0~ubuntu-focal'} + eid::dockerhost: &id023 {version: '5:20.10.6~3-0~ubuntu-focal'} entropyclient: null infra_ca_rp: null konsulter: null @@ -1197,7 +1198,7 @@ classes: konsulter: null mailclient: *id001 nrpe: null - prid: *id021 + prid: *id022 servicemonitor: null sunet::rsyslog: null sunet::server: *id002 @@ -1205,7 +1206,7 @@ classes: prid-2.test.sveidas.se: autoupdate: null common: null - eid::dockerhost: *id022 + eid::dockerhost: *id023 entropyclient: null infra_ca_rp: null konsulter: null @@ -1290,13 +1291,13 @@ classes: validator-1.komreg.net: autoupdate: null common: null - eid::dockerhost: &id023 {version: '5:20.10.8~3-0~ubuntu-bionic'} + eid::dockerhost: &id024 {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: &id024 + sunet::frontend::register_sites: &id025 sites: validator.swedenconnect.se: frontends: [fe-fre-3.komreg.net, fe-tug-3.komreg.net] @@ -1304,7 +1305,7 @@ classes: sunet::rsyslog: null sunet::server: *id002 sunetops: null - validator: &id025 {version: 3.0.10} + validator: &id026 {version: 3.0.10} validator-1.qa.komreg.net: autoupdate: null common: null @@ -1340,17 +1341,17 @@ classes: validator-2.komreg.net: autoupdate: null common: null - eid::dockerhost: *id023 + eid::dockerhost: *id024 entropyclient: null infra_ca_rp: null konsulter: null mailclient: *id001 nrpe: null - sunet::frontend::register_sites: *id024 + sunet::frontend::register_sites: *id025 sunet::rsyslog: null sunet::server: *id002 sunetops: null - validator: *id025 + validator: *id026 web-1.qa.sveidas.se: autoupdate: null common: null