From d469703890b19a9a8a445f1ab1b676b170bcaa15 Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Thu, 27 Jun 2019 08:47:20 +0200 Subject: [PATCH] update db --- global/overlay/etc/puppet/cosmos-db.yaml | 65 +++++++++++++----------- 1 file changed, 35 insertions(+), 30 deletions(-) diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml index 9294de5b..ecd97987 100644 --- a/global/overlay/etc/puppet/cosmos-db.yaml +++ b/global/overlay/etc/puppet/cosmos-db.yaml @@ -23,12 +23,15 @@ classes: autoupdate: null common: null eid::dockerhost: null + eidas_de_middleware: &id002 {hostname: demw.eidas.swedenconnect.se, version: 1.1.0-qa} entropyclient: null infra_ca_rp: null konsulter: null mailclient: *id001 nrpe: null - sunet::frontend::register_sites: &id002 + saml_metadata: &id003 {filename: /opt/eidas-middleware/configuration/serviceprovider-metadata/connector-metadata.xml, + url: 'https://connector.eidas.swedenconnect.se/idp/metadata/sp'} + sunet::frontend::register_sites: &id004 sites: demw.eidas.swedenconnect.se: frontends: [fe-fre-3.komreg.net, fe-tug-3.komreg.net] @@ -39,25 +42,27 @@ classes: autoupdate: null common: null eid::dockerhost: null + eidas_de_middleware: *id002 entropyclient: null infra_ca_rp: null konsulter: null mailclient: *id001 nrpe: null - sunet::frontend::register_sites: *id002 + saml_metadata: *id003 + sunet::frontend::register_sites: *id004 sunet::rsyslog: null sunetops: null eidas-connector-1.sveidas.se: autoupdate: null common: null eid::dockerhost: null - eidas_connector: &id003 {hostname: connector.eidas.swedenconnect.se, version: 1.5.2} + eidas_connector: &id005 {hostname: connector.eidas.swedenconnect.se, version: 1.5.2} entropyclient: null infra_ca_rp: null konsulter: null mailclient: *id001 nrpe: null - sunet::frontend::register_sites: &id004 + sunet::frontend::register_sites: &id006 sites: connector.eidas.swedenconnect.se: frontends: [fe-fre-3.komreg.net, fe-tug-3.komreg.net] @@ -68,39 +73,39 @@ classes: autoupdate: null common: null eid::dockerhost: null - eidas_connector: *id003 + eidas_connector: *id005 entropyclient: null infra_ca_rp: null konsulter: null mailclient: *id001 nrpe: null - sunet::frontend::register_sites: *id004 + sunet::frontend::register_sites: *id006 sunet::rsyslog: null sunetops: null eidas-connector-3.sveidas.se: autoupdate: null common: null eid::dockerhost: null - eidas_connector: *id003 + eidas_connector: *id005 entropyclient: null infra_ca_rp: null konsulter: null mailclient: *id001 nrpe: null - sunet::frontend::register_sites: *id004 + sunet::frontend::register_sites: *id006 sunet::rsyslog: null sunetops: null eidas-connector-4.sveidas.se: autoupdate: null common: null eid::dockerhost: null - eidas_connector: *id003 + eidas_connector: *id005 entropyclient: null infra_ca_rp: null konsulter: null mailclient: *id001 nrpe: null - sunet::frontend::register_sites: *id004 + sunet::frontend::register_sites: *id006 sunet::rsyslog: null sunetops: null eidas-node-1.qa.sveidas.se: @@ -145,14 +150,14 @@ classes: autoupdate: null common: null eid::dockerhost: null - eidas_proxy: &id005 {hostname: proxy.eidas.swedenconnect.se, version: 1.1.15} + eidas_proxy: &id007 {hostname: proxy.eidas.swedenconnect.se, version: 1.1.15} entropyclient: null infra_ca_rp: null konsulter: null mailclient: *id001 nrpe: null servicemonitor: null - sunet::frontend::register_sites: &id006 + sunet::frontend::register_sites: &id008 sites: proxy.eidas.swedenconnect.se: frontends: [fe-fre-3.komreg.net, fe-tug-3.komreg.net] @@ -163,42 +168,42 @@ classes: autoupdate: null common: null eid::dockerhost: null - eidas_proxy: *id005 + eidas_proxy: *id007 entropyclient: null infra_ca_rp: null konsulter: null mailclient: *id001 nrpe: null servicemonitor: null - sunet::frontend::register_sites: *id006 + sunet::frontend::register_sites: *id008 sunet::rsyslog: null sunetops: null eidas-proxy-3.sveidas.se: autoupdate: null common: null eid::dockerhost: null - eidas_proxy: *id005 + eidas_proxy: *id007 entropyclient: null infra_ca_rp: null konsulter: null mailclient: *id001 nrpe: null servicemonitor: null - sunet::frontend::register_sites: *id006 + sunet::frontend::register_sites: *id008 sunet::rsyslog: null sunetops: null eidas-proxy-4.sveidas.se: autoupdate: null common: null eid::dockerhost: null - eidas_proxy: *id005 + eidas_proxy: *id007 entropyclient: null infra_ca_rp: null konsulter: null mailclient: *id001 nrpe: null servicemonitor: null - sunet::frontend::register_sites: *id006 + sunet::frontend::register_sites: *id008 sunet::rsyslog: null sunetops: null eidas-redis-1.sveidas.se: @@ -253,7 +258,7 @@ classes: infra_ca_rp: null mailclient: *id001 nrpe: null - redis_frontend_node: &id007 {hostname: redis.sveidas.se} + redis_frontend_node: &id009 {hostname: redis.sveidas.se} sunet::rsyslog: null sunetops: null eidas-redis-fe-2.sveidas.se: @@ -264,7 +269,7 @@ classes: infra_ca_rp: null mailclient: *id001 nrpe: null - redis_frontend_node: *id007 + redis_frontend_node: *id009 sunet::rsyslog: null sunetops: null eidas-test-1.sveidas.se: @@ -277,14 +282,14 @@ classes: mailclient: *id001 nrpe: null servicemonitor: null - sunet::frontend::register_sites: &id008 + sunet::frontend::register_sites: &id010 sites: test.swedenconnect.se: frontends: [fe-fre-3.komreg.net, fe-tug-3.komreg.net] port: '443' sunet::rsyslog: null sunetops: null - test_my_eid: &id009 {environment: prod, hostname: test.swedenconnect.se, version: 1.1.1} + test_my_eid: &id011 {environment: prod, hostname: test.swedenconnect.se, version: 1.1.1} eidas-test-2.sveidas.se: autoupdate: null common: null @@ -295,10 +300,10 @@ classes: mailclient: *id001 nrpe: null servicemonitor: null - sunet::frontend::register_sites: *id008 + sunet::frontend::register_sites: *id010 sunet::rsyslog: null sunetops: null - test_my_eid: *id009 + test_my_eid: *id011 eidastest-1.qa.sveidas.se: autoupdate: null common: null @@ -787,7 +792,7 @@ classes: konsulter: null mailclient: *id001 nrpe: null - sunet::rsyslog: &id010 {udp_client: 94.176.224.0/24, udp_port: 514} + sunet::rsyslog: &id012 {udp_client: 94.176.224.0/24, udp_port: 514} sunetops: null log-2.sveidas.se: autoupdate: null @@ -798,7 +803,7 @@ classes: konsulter: null mailclient: *id001 nrpe: null - sunet::rsyslog: *id010 + sunet::rsyslog: *id012 sunetops: null log.qa.sveidas.se: autoupdate: null @@ -994,7 +999,7 @@ classes: konsulter: null mailclient: *id001 nrpe: null - prid: &id011 {clients: prid_prod_clients, version: 1.0.1} + prid: &id013 {clients: prid_prod_clients, version: 1.0.1} servicemonitor: null sunet::rsyslog: null sunetops: null @@ -1007,7 +1012,7 @@ classes: konsulter: null mailclient: *id001 nrpe: null - prid: *id011 + prid: *id013 servicemonitor: null sunet::rsyslog: null sunetops: null @@ -1160,7 +1165,7 @@ members: kvminfra-tug-3.komreg.net, kvmmeta-fre-3.komreg.net, kvmmeta-tug-3.komreg.net] eidas_connector: [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_de_middleware: [demw-1.qa.sveidas.se] + eidas_de_middleware: [demw-1.qa.sveidas.se, demw-1.sveidas.se, demw-2.sveidas.se] eidas_hsm_client: [eumd-1.komreg.net, eumd-2.komreg.net, natmd-1.komreg.net, natmd-2.komreg.net] eidas_log: [log-1.sveidas.se, log-2.sveidas.se, log.qa.sveidas.se] eidas_metadata_key: [md-eu1.qa.komreg.net, md1.komreg.net] @@ -1267,7 +1272,7 @@ members: redis_cluster_node: [eidas-redis-1.sveidas.se, eidas-redis-2.sveidas.se, eidas-redis-3.sveidas.se, 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] + 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]