From 0d46363102eede5f8224acac4e7641bd70c3f992 Mon Sep 17 00:00:00 2001 From: Maria Haider Date: Fri, 28 May 2021 14:29:17 +0200 Subject: [PATCH] update db --- global/overlay/etc/puppet/cosmos-db.yaml | 105 +++++++++++++---------- 1 file changed, 62 insertions(+), 43 deletions(-) diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml index 783504db..f6237a5c 100644 --- a/global/overlay/etc/puppet/cosmos-db.yaml +++ b/global/overlay/etc/puppet/cosmos-db.yaml @@ -202,13 +202,17 @@ classes: sunet::server: *id002 sunetops: null eidas-proxy-1.test.sveidas.se: + autoupdate: null common: null + eid::dockerhost: &id007 {version: '5:20.10.6~3-0~ubuntu-focal'} entropyclient: null infra_ca_rp: null + konsulter: null mailclient: *id001 nrpe: null sunet::rsyslog: null sunet::server: *id002 + sunet_iaas_cloud: null sunetops: null eidas-proxy-2.sveidas.se: autoupdate: null @@ -226,13 +230,17 @@ classes: sunet::server: *id002 sunetops: null eidas-proxy-2.test.sveidas.se: + autoupdate: null common: null + eid::dockerhost: *id007 entropyclient: null infra_ca_rp: null + konsulter: null mailclient: *id001 nrpe: null sunet::rsyslog: null sunet::server: *id002 + sunet_iaas_cloud: null sunetops: null eidas-proxy-3.sveidas.se: autoupdate: null @@ -320,7 +328,7 @@ classes: infra_ca_rp: null mailclient: *id001 nrpe: null - redis_frontend_node: &id007 {hostname: redis.sveidas.se} + redis_frontend_node: &id008 {hostname: redis.sveidas.se} sunet::rsyslog: null sunet::server: *id002 sunetops: null @@ -332,7 +340,7 @@ classes: infra_ca_rp: null mailclient: *id001 nrpe: null - redis_frontend_node: *id007 + redis_frontend_node: *id008 sunet::rsyslog: null sunet::server: *id002 sunetops: null @@ -346,7 +354,7 @@ classes: mailclient: *id001 nrpe: null servicemonitor: null - sunet::frontend::register_sites: &id008 + sunet::frontend::register_sites: &id009 sites: test.swedenconnect.se: frontends: [fe-fre-3.komreg.net, fe-tug-3.komreg.net] @@ -354,7 +362,7 @@ classes: sunet::rsyslog: null sunet::server: *id002 sunetops: null - test_my_eid: &id009 {environment: prod, hostname: test.swedenconnect.se, version: 1.3.1} + test_my_eid: &id010 {environment: prod, hostname: test.swedenconnect.se, version: 1.3.1} eidas-test-2.sveidas.se: autoupdate: null common: null @@ -365,11 +373,11 @@ classes: mailclient: *id001 nrpe: null servicemonitor: null - sunet::frontend::register_sites: *id008 + sunet::frontend::register_sites: *id009 sunet::rsyslog: null sunet::server: *id002 sunetops: null - test_my_eid: *id009 + test_my_eid: *id010 eidastest-1.qa.sveidas.se: autoupdate: null common: null @@ -889,7 +897,7 @@ classes: konsulter: null mailclient: *id001 nrpe: null - sunet::rsyslog: &id010 {udp_client: 94.176.224.0/24, udp_port: 514} + sunet::rsyslog: &id011 {udp_client: 94.176.224.0/24, udp_port: 514} sunet::server: *id002 sunetops: null log-2.sveidas.se: @@ -903,7 +911,7 @@ classes: konsulter: null mailclient: *id001 nrpe: null - sunet::rsyslog: *id010 + sunet::rsyslog: *id011 sunet::server: *id002 sunetops: null log.qa.sveidas.se: @@ -1117,20 +1125,24 @@ classes: konsulter: null mailclient: *id001 nrpe: null - prid: &id011 {clients: prid_prod_clients, mdsl: 'https://md.eidas.swedenconnect.se/mdservicelist-aggregate.xml', + prid: &id012 {clients: prid_prod_clients, mdsl: 'https://md.eidas.swedenconnect.se/mdservicelist-aggregate.xml', version: 1.0.4} servicemonitor: null sunet::rsyslog: null sunet::server: *id002 sunetops: null prid-1.test.sveidas.se: + autoupdate: null common: null + eid::dockerhost: &id013 {version: '5:20.10.6~3-0~ubuntu-focal'} entropyclient: null infra_ca_rp: null + konsulter: null mailclient: *id001 nrpe: null sunet::rsyslog: null sunet::server: *id002 + sunet_iaas_cloud: null sunetops: null prid-2.sveidas.se: autoupdate: null @@ -1141,19 +1153,23 @@ classes: konsulter: null mailclient: *id001 nrpe: null - prid: *id011 + prid: *id012 servicemonitor: null sunet::rsyslog: null sunet::server: *id002 sunetops: null prid-2.test.sveidas.se: + autoupdate: null common: null + eid::dockerhost: *id013 entropyclient: null infra_ca_rp: null + konsulter: null mailclient: *id001 nrpe: null sunet::rsyslog: null sunet::server: *id002 + sunet_iaas_cloud: null sunetops: null r1.komreg.net: autoupdate: null @@ -1230,7 +1246,7 @@ classes: konsulter: null mailclient: *id001 nrpe: null - sunet::frontend::register_sites: &id012 + sunet::frontend::register_sites: &id014 sites: validator.swedenconnect.se: frontends: [fe-fre-3.komreg.net, fe-tug-3.komreg.net] @@ -1238,7 +1254,7 @@ classes: sunet::rsyslog: null sunet::server: *id002 sunetops: null - validator: &id013 {version: 3.0.10} + validator: &id015 {version: 3.0.10} validator-1.qa.komreg.net: autoupdate: null common: null @@ -1276,11 +1292,11 @@ classes: konsulter: null mailclient: *id001 nrpe: null - sunet::frontend::register_sites: *id012 + sunet::frontend::register_sites: *id014 sunet::rsyslog: null sunet::server: *id002 sunetops: null - validator: *id013 + validator: *id015 web-1.qa.sveidas.se: autoupdate: null common: null @@ -1326,18 +1342,19 @@ members: autoupdate: [demw-1.qa.sveidas.se, demw-1.sveidas.se, demw-2.sveidas.se, eidas-connector-1.sveidas.se, eidas-connector-2.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-redis-1.sveidas.se, eidas-redis-2.sveidas.se, eidas-redis-3.sveidas.se, - eidas-redis-4.sveidas.se, eidas-redis-fe-1.sveidas.se, eidas-redis-fe-2.sveidas.se, - eidas-test-1.sveidas.se, eidas-test-2.sveidas.se, eidastest-1.qa.sveidas.se, eumd-1.komreg.net, - eumd-2.komreg.net, eupub-1.komreg.net, eupub-2.komreg.net, jmp.komreg.net, jump-fre-3.komreg.net, + 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-redis-1.sveidas.se, + eidas-redis-2.sveidas.se, eidas-redis-3.sveidas.se, eidas-redis-4.sveidas.se, + eidas-redis-fe-1.sveidas.se, eidas-redis-fe-2.sveidas.se, eidas-test-1.sveidas.se, + eidas-test-2.sveidas.se, eidastest-1.qa.sveidas.se, eumd-1.komreg.net, eumd-2.komreg.net, + eupub-1.komreg.net, eupub-2.komreg.net, jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.komreg.net, log-1.sveidas.se, log-2.sveidas.se, log.qa.sveidas.se, md-eu1.qa.komreg.net, md-eu1.qa.komreg.net, md1.komreg.net, monitor-fre-3.komreg.net, monitor-tug-3.komreg.net, natmd-1.komreg.net, natmd-2.komreg.net, natpub-1.komreg.net, natpub-2.komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.komreg.net, prid-1.qa.sveidas.se, - prid-1.sveidas.se, prid-2.sveidas.se, r1.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] + prid-1.sveidas.se, prid-1.test.sveidas.se, prid-2.sveidas.se, prid-2.test.sveidas.se, + r1.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] common: [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, eidas-connector-3.sveidas.se, eidas-connector-4.sveidas.se, eidas-node-1.qa.sveidas.se, @@ -1361,16 +1378,16 @@ members: validator-2.komreg.net, web-1.qa.sveidas.se] eid::dockerhost: [demw-1.qa.sveidas.se, demw-1.sveidas.se, demw-2.sveidas.se, eidas-connector-1.sveidas.se, eidas-connector-2.sveidas.se, eidas-connector-3.sveidas.se, eidas-connector-4.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-redis-1.sveidas.se, - eidas-redis-2.sveidas.se, eidas-redis-3.sveidas.se, eidas-redis-4.sveidas.se, - eidas-redis-fe-1.sveidas.se, eidas-redis-fe-2.sveidas.se, eidas-test-1.sveidas.se, - eidas-test-2.sveidas.se, eidastest-1.qa.sveidas.se, eumd-1.komreg.net, eumd-2.komreg.net, - fe-fre-3.komreg.net, fe-tug-3.komreg.net, log-1.sveidas.se, log-2.sveidas.se, - log.qa.sveidas.se, monitor-tug-3.komreg.net, natmd-1.komreg.net, natmd-2.komreg.net, - nic.komreg.net, prid-1.sveidas.se, prid-2.sveidas.se, 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] + 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-redis-1.sveidas.se, eidas-redis-2.sveidas.se, + eidas-redis-3.sveidas.se, eidas-redis-4.sveidas.se, eidas-redis-fe-1.sveidas.se, + eidas-redis-fe-2.sveidas.se, eidas-test-1.sveidas.se, eidas-test-2.sveidas.se, + eidastest-1.qa.sveidas.se, eumd-1.komreg.net, eumd-2.komreg.net, fe-fre-3.komreg.net, + fe-tug-3.komreg.net, log-1.sveidas.se, log-2.sveidas.se, log.qa.sveidas.se, monitor-tug-3.komreg.net, + natmd-1.komreg.net, natmd-2.komreg.net, nic.komreg.net, prid-1.sveidas.se, prid-1.test.sveidas.se, + prid-2.sveidas.se, prid-2.test.sveidas.se, 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] eid::kvmhost: [kvmdemw-fre-3a.komreg.net, kvmdemw-fre-3b.komreg.net, kvmeidas-fre-3.komreg.net, kvmeidas-tug-3.komreg.net, kvmfe-fre-3.komreg.net, kvmfe-tug-3.komreg.net, kvminfra-fre-3.komreg.net, kvminfra-tug-3.komreg.net, kvmmeta-fre-3.komreg.net, kvmmeta-tug-3.komreg.net] @@ -1432,13 +1449,14 @@ members: konsulter: [demw-1.qa.sveidas.se, demw-1.sveidas.se, demw-2.sveidas.se, eidas-connector-1.sveidas.se, eidas-connector-2.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, eumd-1.komreg.net, eumd-2.komreg.net, - jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.komreg.net, log-1.sveidas.se, - log-2.sveidas.se, md-eu1.qa.komreg.net, md-eu1.qa.komreg.net, md1.komreg.net, - natmd-1.komreg.net, natmd-2.komreg.net, nic.komreg.net, prid-1.qa.sveidas.se, - prid-1.sveidas.se, prid-2.sveidas.se, 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] + 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, + eumd-1.komreg.net, eumd-2.komreg.net, jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.komreg.net, + log-1.sveidas.se, log-2.sveidas.se, md-eu1.qa.komreg.net, md-eu1.qa.komreg.net, + md1.komreg.net, natmd-1.komreg.net, natmd-2.komreg.net, nic.komreg.net, prid-1.qa.sveidas.se, + prid-1.sveidas.se, prid-1.test.sveidas.se, prid-2.sveidas.se, prid-2.test.sveidas.se, + 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] mailclient: [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, eidas-connector-3.sveidas.se, eidas-connector-4.sveidas.se, eidas-node-1.qa.sveidas.se, @@ -1561,10 +1579,11 @@ members: test-1.test.sveidas.se, validator-1.komreg.net, validator-1.qa.komreg.net, validator-1.test.sveidas.se, validator-2.komreg.net, web-1.qa.sveidas.se] sunet_iaas_cloud: [demw-1.qa.sveidas.se, eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se, - eidastest-1.qa.sveidas.se, jmp.komreg.net, log.qa.sveidas.se, md-eu1.qa.komreg.net, - md-eu1.qa.komreg.net, md1.komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.komreg.net, - prid-1.qa.sveidas.se, r1.komreg.net, refidp-1.qa.sveidas.se, test-1.qa.sveidas.se, - test-1.test.sveidas.se, validator-1.qa.komreg.net, web-1.qa.sveidas.se] + eidas-proxy-1.test.sveidas.se, eidas-proxy-2.test.sveidas.se, eidastest-1.qa.sveidas.se, + jmp.komreg.net, log.qa.sveidas.se, md-eu1.qa.komreg.net, md-eu1.qa.komreg.net, + md1.komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.komreg.net, prid-1.qa.sveidas.se, + prid-1.test.sveidas.se, prid-2.test.sveidas.se, r1.komreg.net, refidp-1.qa.sveidas.se, + test-1.qa.sveidas.se, test-1.test.sveidas.se, validator-1.qa.komreg.net, web-1.qa.sveidas.se] sunetops: [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, eidas-connector-3.sveidas.se, eidas-connector-4.sveidas.se, eidas-node-1.qa.sveidas.se,