From 021e41605feb925a5e51ae5702ab4f6ef30337a5 Mon Sep 17 00:00:00 2001 From: Maria Haider Date: Thu, 3 Jun 2021 15:40:46 +0200 Subject: [PATCH] update db --- global/overlay/etc/puppet/cosmos-db.yaml | 87 ++++++++++++++---------- 1 file changed, 52 insertions(+), 35 deletions(-) diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml index 4d458d78..27dc4edd 100644 --- a/global/overlay/etc/puppet/cosmos-db.yaml +++ b/global/overlay/etc/puppet/cosmos-db.yaml @@ -85,11 +85,17 @@ classes: 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} entropyclient: null infra_ca_rp: null konsulter: null mailclient: *id001 nrpe: null + sunet::frontend::register_sites: &id007 + sites: + test.connector.eidas.swedenconnect.se: + frontends: [se-fre-lb-1.sunet.se, se-tug-lb-1.sunet.se] + port: '443' sunet::rsyslog: null sunet::server: *id002 sunet_iaas_cloud: null @@ -112,11 +118,13 @@ classes: autoupdate: null common: null eid::dockerhost: *id005 + eidas_connector: *id006 entropyclient: null infra_ca_rp: null konsulter: null mailclient: *id001 nrpe: null + sunet::frontend::register_sites: *id007 sunet::rsyslog: null sunet::server: *id002 sunet_iaas_cloud: null @@ -193,7 +201,7 @@ classes: autoupdate: null common: null eid::dockerhost: null - eidas_proxy: &id006 {hostname: proxy.eidas.swedenconnect.se, spring_config_param: SPRING_CONFIG_ADDITIONAL_LOCATION, + eidas_proxy: &id008 {hostname: proxy.eidas.swedenconnect.se, spring_config_param: SPRING_CONFIG_ADDITIONAL_LOCATION, version: 1.3.5} entropyclient: null infra_ca_rp: null @@ -201,7 +209,7 @@ classes: mailclient: *id001 nrpe: null servicemonitor: null - sunet::frontend::register_sites: &id007 + sunet::frontend::register_sites: &id009 sites: proxy.eidas.swedenconnect.se: frontends: [fe-fre-3.komreg.net, fe-tug-3.komreg.net] @@ -212,7 +220,7 @@ classes: eidas-proxy-1.test.sveidas.se: autoupdate: null common: null - eid::dockerhost: &id008 {version: '5:20.10.6~3-0~ubuntu-focal'} + eid::dockerhost: &id010 {version: '5:20.10.6~3-0~ubuntu-focal'} entropyclient: null infra_ca_rp: null konsulter: null @@ -226,21 +234,21 @@ classes: autoupdate: null common: null eid::dockerhost: null - eidas_proxy: *id006 + eidas_proxy: *id008 entropyclient: null infra_ca_rp: null konsulter: null mailclient: *id001 nrpe: null servicemonitor: null - sunet::frontend::register_sites: *id007 + sunet::frontend::register_sites: *id009 sunet::rsyslog: null sunet::server: *id002 sunetops: null eidas-proxy-2.test.sveidas.se: autoupdate: null common: null - eid::dockerhost: *id008 + eid::dockerhost: *id010 entropyclient: null infra_ca_rp: null konsulter: null @@ -254,14 +262,14 @@ classes: autoupdate: null common: null eid::dockerhost: null - eidas_proxy: *id006 + eidas_proxy: *id008 entropyclient: null infra_ca_rp: null konsulter: null mailclient: *id001 nrpe: null servicemonitor: null - sunet::frontend::register_sites: *id007 + sunet::frontend::register_sites: *id009 sunet::rsyslog: null sunet::server: *id002 sunetops: null @@ -269,14 +277,14 @@ classes: autoupdate: null common: null eid::dockerhost: null - eidas_proxy: *id006 + eidas_proxy: *id008 entropyclient: null infra_ca_rp: null konsulter: null mailclient: *id001 nrpe: null servicemonitor: null - sunet::frontend::register_sites: *id007 + sunet::frontend::register_sites: *id009 sunet::rsyslog: null sunet::server: *id002 sunetops: null @@ -336,7 +344,7 @@ classes: infra_ca_rp: null mailclient: *id001 nrpe: null - redis_frontend_node: &id009 {hostname: redis.sveidas.se} + redis_frontend_node: &id011 {hostname: redis.sveidas.se} sunet::rsyslog: null sunet::server: *id002 sunetops: null @@ -348,7 +356,7 @@ classes: infra_ca_rp: null mailclient: *id001 nrpe: null - redis_frontend_node: *id009 + redis_frontend_node: *id011 sunet::rsyslog: null sunet::server: *id002 sunetops: null @@ -362,7 +370,7 @@ classes: mailclient: *id001 nrpe: null servicemonitor: null - sunet::frontend::register_sites: &id010 + sunet::frontend::register_sites: &id012 sites: test.swedenconnect.se: frontends: [fe-fre-3.komreg.net, fe-tug-3.komreg.net] @@ -370,7 +378,7 @@ classes: sunet::rsyslog: null sunet::server: *id002 sunetops: null - test_my_eid: &id011 {environment: prod, hostname: test.swedenconnect.se, version: 1.3.1} + test_my_eid: &id013 {environment: prod, hostname: test.swedenconnect.se, version: 1.3.1} eidas-test-2.sveidas.se: autoupdate: null common: null @@ -381,11 +389,11 @@ classes: mailclient: *id001 nrpe: null servicemonitor: null - sunet::frontend::register_sites: *id010 + sunet::frontend::register_sites: *id012 sunet::rsyslog: null sunet::server: *id002 sunetops: null - test_my_eid: *id011 + test_my_eid: *id013 eidastest-1.qa.sveidas.se: autoupdate: null common: null @@ -905,7 +913,7 @@ classes: konsulter: null mailclient: *id001 nrpe: null - sunet::rsyslog: &id012 {udp_client: 94.176.224.0/24, udp_port: 514} + sunet::rsyslog: &id014 {udp_client: 94.176.224.0/24, udp_port: 514} sunet::server: *id002 sunetops: null log-2.sveidas.se: @@ -919,7 +927,7 @@ classes: konsulter: null mailclient: *id001 nrpe: null - sunet::rsyslog: *id012 + sunet::rsyslog: *id014 sunet::server: *id002 sunetops: null log.qa.sveidas.se: @@ -1133,7 +1141,7 @@ classes: konsulter: null mailclient: *id001 nrpe: null - prid: &id013 {clients: prid_prod_clients, mdsl: 'https://md.eidas.swedenconnect.se/mdservicelist-aggregate.xml', + prid: &id015 {clients: prid_prod_clients, mdsl: 'https://md.eidas.swedenconnect.se/mdservicelist-aggregate.xml', version: 1.0.4} servicemonitor: null sunet::rsyslog: null @@ -1142,7 +1150,7 @@ classes: prid-1.test.sveidas.se: autoupdate: null common: null - eid::dockerhost: &id014 {version: '5:20.10.6~3-0~ubuntu-focal'} + eid::dockerhost: &id016 {version: '5:20.10.6~3-0~ubuntu-focal'} entropyclient: null infra_ca_rp: null konsulter: null @@ -1161,7 +1169,7 @@ classes: konsulter: null mailclient: *id001 nrpe: null - prid: *id013 + prid: *id015 servicemonitor: null sunet::rsyslog: null sunet::server: *id002 @@ -1169,7 +1177,7 @@ classes: prid-2.test.sveidas.se: autoupdate: null common: null - eid::dockerhost: *id014 + eid::dockerhost: *id016 entropyclient: null infra_ca_rp: null konsulter: null @@ -1241,10 +1249,16 @@ classes: mailclient: *id001 nrpe: null servicemonitor: null + sunet::frontend::register_sites: + sites: + test.test.swedenconnect.se: + frontends: [se-fre-lb-1.sunet.se, se-tug-lb-1.sunet.se] + port: '443' sunet::rsyslog: null sunet::server: *id002 sunet_iaas_cloud: null sunetops: null + test_my_eid: {hostname: test.test.swedenconnect.se, version: 1.3.1} validator-1.komreg.net: autoupdate: null common: null @@ -1254,7 +1268,7 @@ classes: konsulter: null mailclient: *id001 nrpe: null - sunet::frontend::register_sites: &id015 + sunet::frontend::register_sites: &id017 sites: validator.swedenconnect.se: frontends: [fe-fre-3.komreg.net, fe-tug-3.komreg.net] @@ -1262,7 +1276,7 @@ classes: sunet::rsyslog: null sunet::server: *id002 sunetops: null - validator: &id016 {version: 3.0.10} + validator: &id018 {version: 3.0.10} validator-1.qa.komreg.net: autoupdate: null common: null @@ -1304,11 +1318,11 @@ classes: konsulter: null mailclient: *id001 nrpe: null - sunet::frontend::register_sites: *id015 + sunet::frontend::register_sites: *id017 sunet::rsyslog: null sunet::server: *id002 sunetops: null - validator: *id016 + validator: *id018 web-1.qa.sveidas.se: autoupdate: null common: null @@ -1407,7 +1421,8 @@ members: 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] eid::telegraf: [log-1.sveidas.se, log-2.sveidas.se, log.qa.sveidas.se] - eidas_connector: [eidas-connector-1.sveidas.se, eidas-connector-2.sveidas.se, eidas-connector-3.sveidas.se, + eidas_connector: [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_de_middleware: [demw-1.qa.sveidas.se] eidas_de_middleware_hsm: [demw-1.sveidas.se, demw-2.sveidas.se] @@ -1543,13 +1558,14 @@ members: sunet::auditd: [jmp.komreg.net] sunet::frontend::load_balancer: [fe-fre-3.komreg.net, fe-tug-3.komreg.net] sunet::frontend::register_sites: [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, eidastest-1.qa.sveidas.se, - eupub-1.komreg.net, eupub-2.komreg.net, natpub-1.komreg.net, natpub-2.komreg.net, - p1.komreg.net, p2.qa.komreg.net, refidp-1.qa.sveidas.se, test-1.qa.sveidas.se, - validator-1.komreg.net, validator-1.qa.komreg.net, validator-2.komreg.net, web-1.qa.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, 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, 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, @@ -1623,7 +1639,8 @@ members: validator-1.komreg.net, validator-1.qa.komreg.net, validator-1.test.komreg.net, validator-2.komreg.net, web-1.qa.sveidas.se] swedenconnect_refidp: [refidp-1.qa.sveidas.se] - test_my_eid: [eidas-test-1.sveidas.se, eidas-test-2.sveidas.se, test-1.qa.sveidas.se] + test_my_eid: [eidas-test-1.sveidas.se, eidas-test-2.sveidas.se, test-1.qa.sveidas.se, + test-1.test.sveidas.se] validator: [validator-1.komreg.net, validator-1.qa.komreg.net, validator-2.komreg.net] webserver: [demw-1.qa.sveidas.se, demw-1.sveidas.se, demw-2.sveidas.se]