From 366354591ba2bd46e42e7f46eb8eff1958afd05f Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Fri, 12 Jul 2019 11:31:21 +0200 Subject: [PATCH] update db --- global/overlay/etc/puppet/cosmos-db.yaml | 82 ++++++++++++------------ 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml index 3031a7fa..7a50d677 100644 --- a/global/overlay/etc/puppet/cosmos-db.yaml +++ b/global/overlay/etc/puppet/cosmos-db.yaml @@ -24,15 +24,15 @@ classes: autoupdate: null common: null eid::dockerhost: null - eidas_de_middleware: &id003 {hostname: demw.eidas.swedenconnect.se, version: 1.1.0-qa} + eidas_de_middleware_hsm: {hostname: demw.eidas.swedenconnect.se, version: 110-fixes-sc-p11} entropyclient: null infra_ca_rp: null konsulter: null mailclient: *id001 nrpe: null - saml_metadata: &id004 {filename: /opt/eidas-middleware/configuration/serviceprovider-metadata/connector-metadata.xml, + saml_metadata: {filename: /opt/eidas-middleware/configuration/serviceprovider-metadata/connector-metadata.xml, url: 'https://connector.eidas.swedenconnect.se/idp/metadata/sp'} - sunet::frontend::register_sites: &id005 + sunet::frontend::register_sites: sites: demw.eidas.swedenconnect.se: frontends: [fe-fre-3.komreg.net, fe-tug-3.komreg.net] @@ -44,14 +44,14 @@ classes: autoupdate: null common: null eid::dockerhost: null - eidas_de_middleware: *id003 + eidas_de_middleware_hsm: {hostname: demw.eidas.swedenconnect.se, version: 110-fixes-sc-p11} entropyclient: null infra_ca_rp: null konsulter: null mailclient: *id001 nrpe: null - saml_metadata: *id004 - sunet::frontend::register_sites: *id005 + saml_metadata: {filename: /opt/eidas-middleware/configuration/serviceprovider-metadata/connector-metadata.xml, + url: 'https://connector.eidas.swedenconnect.se/idp/metadata/sp'} sunet::rsyslog: null sunet::server: *id002 sunetops: null @@ -59,13 +59,13 @@ classes: autoupdate: null common: null eid::dockerhost: null - eidas_connector: &id006 {hostname: connector.eidas.swedenconnect.se, version: 1.5.2} + eidas_connector: &id003 {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: &id007 + sunet::frontend::register_sites: &id004 sites: connector.eidas.swedenconnect.se: frontends: [fe-fre-3.komreg.net, fe-tug-3.komreg.net] @@ -77,13 +77,13 @@ classes: autoupdate: null common: null eid::dockerhost: null - eidas_connector: *id006 + eidas_connector: *id003 entropyclient: null infra_ca_rp: null konsulter: null mailclient: *id001 nrpe: null - sunet::frontend::register_sites: *id007 + sunet::frontend::register_sites: *id004 sunet::rsyslog: null sunet::server: *id002 sunetops: null @@ -91,13 +91,13 @@ classes: autoupdate: null common: null eid::dockerhost: null - eidas_connector: *id006 + eidas_connector: *id003 entropyclient: null infra_ca_rp: null konsulter: null mailclient: *id001 nrpe: null - sunet::frontend::register_sites: *id007 + sunet::frontend::register_sites: *id004 sunet::rsyslog: null sunet::server: *id002 sunetops: null @@ -105,13 +105,13 @@ classes: autoupdate: null common: null eid::dockerhost: null - eidas_connector: *id006 + eidas_connector: *id003 entropyclient: null infra_ca_rp: null konsulter: null mailclient: *id001 nrpe: null - sunet::frontend::register_sites: *id007 + sunet::frontend::register_sites: *id004 sunet::rsyslog: null sunet::server: *id002 sunetops: null @@ -159,14 +159,14 @@ classes: autoupdate: null common: null eid::dockerhost: null - eidas_proxy: &id008 {hostname: proxy.eidas.swedenconnect.se, version: 1.1.15} + eidas_proxy: &id005 {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: &id009 + sunet::frontend::register_sites: &id006 sites: proxy.eidas.swedenconnect.se: frontends: [fe-fre-3.komreg.net, fe-tug-3.komreg.net] @@ -178,14 +178,14 @@ classes: autoupdate: null common: null eid::dockerhost: null - eidas_proxy: *id008 + eidas_proxy: *id005 entropyclient: null infra_ca_rp: null konsulter: null mailclient: *id001 nrpe: null servicemonitor: null - sunet::frontend::register_sites: *id009 + sunet::frontend::register_sites: *id006 sunet::rsyslog: null sunet::server: *id002 sunetops: null @@ -193,14 +193,14 @@ classes: autoupdate: null common: null eid::dockerhost: null - eidas_proxy: *id008 + eidas_proxy: *id005 entropyclient: null infra_ca_rp: null konsulter: null mailclient: *id001 nrpe: null servicemonitor: null - sunet::frontend::register_sites: *id009 + sunet::frontend::register_sites: *id006 sunet::rsyslog: null sunet::server: *id002 sunetops: null @@ -208,14 +208,14 @@ classes: autoupdate: null common: null eid::dockerhost: null - eidas_proxy: *id008 + eidas_proxy: *id005 entropyclient: null infra_ca_rp: null konsulter: null mailclient: *id001 nrpe: null servicemonitor: null - sunet::frontend::register_sites: *id009 + sunet::frontend::register_sites: *id006 sunet::rsyslog: null sunet::server: *id002 sunetops: null @@ -275,7 +275,7 @@ classes: infra_ca_rp: null mailclient: *id001 nrpe: null - redis_frontend_node: &id010 {hostname: redis.sveidas.se} + redis_frontend_node: &id007 {hostname: redis.sveidas.se} sunet::rsyslog: null sunet::server: *id002 sunetops: null @@ -287,7 +287,7 @@ classes: infra_ca_rp: null mailclient: *id001 nrpe: null - redis_frontend_node: *id010 + redis_frontend_node: *id007 sunet::rsyslog: null sunet::server: *id002 sunetops: null @@ -301,7 +301,7 @@ classes: mailclient: *id001 nrpe: null servicemonitor: null - sunet::frontend::register_sites: &id011 + sunet::frontend::register_sites: &id008 sites: test.swedenconnect.se: frontends: [fe-fre-3.komreg.net, fe-tug-3.komreg.net] @@ -309,7 +309,7 @@ classes: sunet::rsyslog: null sunet::server: *id002 sunetops: null - test_my_eid: &id012 {environment: prod, hostname: test.swedenconnect.se, version: 1.2.0} + test_my_eid: &id009 {environment: prod, hostname: test.swedenconnect.se, version: 1.2.0} eidas-test-2.sveidas.se: autoupdate: null common: null @@ -320,11 +320,11 @@ classes: mailclient: *id001 nrpe: null servicemonitor: null - sunet::frontend::register_sites: *id011 + sunet::frontend::register_sites: *id008 sunet::rsyslog: null sunet::server: *id002 sunetops: null - test_my_eid: *id012 + test_my_eid: *id009 eidastest-1.qa.sveidas.se: autoupdate: null common: null @@ -833,7 +833,7 @@ classes: konsulter: null mailclient: *id001 nrpe: null - sunet::rsyslog: &id013 {udp_client: 94.176.224.0/24, udp_port: 514} + sunet::rsyslog: &id010 {udp_client: 94.176.224.0/24, udp_port: 514} sunet::server: *id002 sunetops: null log-2.sveidas.se: @@ -845,7 +845,7 @@ classes: konsulter: null mailclient: *id001 nrpe: null - sunet::rsyslog: *id013 + sunet::rsyslog: *id010 sunet::server: *id002 sunetops: null log.qa.sveidas.se: @@ -1055,7 +1055,7 @@ classes: konsulter: null mailclient: *id001 nrpe: null - prid: &id014 {clients: prid_prod_clients, version: 1.0.1} + prid: &id011 {clients: prid_prod_clients, version: 1.0.1} servicemonitor: null sunet::rsyslog: null sunet::server: *id002 @@ -1069,7 +1069,7 @@ classes: konsulter: null mailclient: *id001 nrpe: null - prid: *id014 + prid: *id011 servicemonitor: null sunet::rsyslog: null sunet::server: *id002 @@ -1228,7 +1228,8 @@ 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, demw-1.sveidas.se, demw-2.sveidas.se] + eidas_de_middleware: [demw-1.qa.sveidas.se] + eidas_de_middleware_hsm: [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] @@ -1342,14 +1343,13 @@ members: site_alias: [web-1.qa.sveidas.se] 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.qa.komreg.net, web-1.qa.sveidas.se] + sunet::frontend::register_sites: [demw-1.qa.sveidas.se, demw-1.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.qa.komreg.net, web-1.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, eidas-connector-2.sveidas.se, eidas-connector-3.sveidas.se, eidas-connector-4.sveidas.se,