diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml index dba64e4e..07295464 100644 --- a/global/overlay/etc/puppet/cosmos-db.yaml +++ b/global/overlay/etc/puppet/cosmos-db.yaml @@ -91,7 +91,9 @@ classes: konsulter: null mailclient: *id001 nrpe: null - sunet::frontend::register_sites: &id008 + prid_local: &id008 {clients: prid_qa_clients, mdsl: 'https://test.md.eidas.swedenconnect.se/mdservicelist-aggregate.xml', + version: 1.0.4} + sunet::frontend::register_sites: &id009 sites: test.connector.eidas.swedenconnect.se: frontends: [fe-fre-1.test.komreg.net, fe-tug-1.test.komreg.net] @@ -124,7 +126,8 @@ classes: konsulter: null mailclient: *id001 nrpe: null - sunet::frontend::register_sites: *id008 + prid_local: *id008 + sunet::frontend::register_sites: *id009 sunet::rsyslog: null sunet::server: *id002 sunet_iaas_cloud: null @@ -200,8 +203,8 @@ classes: eidas-proxy-1.sveidas.se: autoupdate: null common: null - 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, + eid::dockerhost: &id010 {version: '5:20.10.8~3-0~ubuntu-bionic'} + eidas_proxy: &id011 {hostname: proxy.eidas.swedenconnect.se, spring_config_param: SPRING_CONFIG_ADDITIONAL_LOCATION, version: 1.4.5_hsm2} entropyclient: null infra_ca_rp: null @@ -209,7 +212,7 @@ classes: mailclient: *id001 nrpe: null servicemonitor: null - sunet::frontend::register_sites: &id011 + sunet::frontend::register_sites: &id012 sites: proxy.eidas.swedenconnect.se: frontends: [fe-fre-3.komreg.net, fe-tug-3.komreg.net] @@ -220,7 +223,7 @@ classes: eidas-proxy-1.test.sveidas.se: autoupdate: null common: null - eid::dockerhost: &id012 {version: '5:20.10.6~3-0~ubuntu-focal'} + eid::dockerhost: &id013 {version: '5:20.10.6~3-0~ubuntu-focal'} entropyclient: null infra_ca_rp: null konsulter: null @@ -233,22 +236,22 @@ classes: eidas-proxy-2.sveidas.se: autoupdate: null common: null - eid::dockerhost: *id009 - eidas_proxy: *id010 + eid::dockerhost: *id010 + eidas_proxy: *id011 entropyclient: null infra_ca_rp: null konsulter: null mailclient: *id001 nrpe: null servicemonitor: null - sunet::frontend::register_sites: *id011 + sunet::frontend::register_sites: *id012 sunet::rsyslog: null sunet::server: *id002 sunetops: null eidas-proxy-2.test.sveidas.se: autoupdate: null common: null - eid::dockerhost: *id012 + eid::dockerhost: *id013 entropyclient: null infra_ca_rp: null konsulter: null @@ -261,37 +264,37 @@ classes: eidas-proxy-3.sveidas.se: autoupdate: null common: null - eid::dockerhost: *id009 - eidas_proxy: *id010 + eid::dockerhost: *id010 + eidas_proxy: *id011 entropyclient: null infra_ca_rp: null konsulter: null mailclient: *id001 nrpe: null servicemonitor: null - sunet::frontend::register_sites: *id011 + sunet::frontend::register_sites: *id012 sunet::rsyslog: null sunet::server: *id002 sunetops: null eidas-proxy-4.sveidas.se: autoupdate: null common: null - eid::dockerhost: *id009 - eidas_proxy: *id010 + eid::dockerhost: *id010 + eidas_proxy: *id011 entropyclient: null infra_ca_rp: null konsulter: null mailclient: *id001 nrpe: null servicemonitor: null - sunet::frontend::register_sites: *id011 + sunet::frontend::register_sites: *id012 sunet::rsyslog: null sunet::server: *id002 sunetops: null eidas-redis-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 @@ -303,7 +306,7 @@ classes: eidas-redis-2.sveidas.se: autoupdate: null common: null - eid::dockerhost: *id013 + eid::dockerhost: *id014 entropyclient: null infra_ca_rp: null mailclient: *id001 @@ -315,7 +318,7 @@ classes: eidas-redis-3.sveidas.se: autoupdate: null common: null - eid::dockerhost: *id013 + eid::dockerhost: *id014 entropyclient: null infra_ca_rp: null mailclient: *id001 @@ -327,7 +330,7 @@ classes: eidas-redis-4.sveidas.se: autoupdate: null common: null - eid::dockerhost: *id013 + eid::dockerhost: *id014 entropyclient: null infra_ca_rp: null mailclient: *id001 @@ -339,38 +342,38 @@ classes: eidas-redis-fe-1.sveidas.se: autoupdate: null common: null - eid::dockerhost: &id014 {version: '5:20.10.8~3-0~ubuntu-bionic'} + eid::dockerhost: &id015 {version: '5:20.10.8~3-0~ubuntu-bionic'} entropyclient: null infra_ca_rp: null mailclient: *id001 nrpe: null - redis_frontend_node: &id015 {hostname: redis.sveidas.se} + redis_frontend_node: &id016 {hostname: redis.sveidas.se} sunet::rsyslog: null sunet::server: *id002 sunetops: null eidas-redis-fe-2.sveidas.se: autoupdate: null common: null - eid::dockerhost: *id014 + eid::dockerhost: *id015 entropyclient: null infra_ca_rp: null mailclient: *id001 nrpe: null - redis_frontend_node: *id015 + redis_frontend_node: *id016 sunet::rsyslog: null sunet::server: *id002 sunetops: null eidas-test-1.sveidas.se: autoupdate: null common: null - eid::dockerhost: &id016 {version: '5:20.10.8~3-0~ubuntu-bionic'} + eid::dockerhost: &id017 {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: &id017 + sunet::frontend::register_sites: &id018 sites: test.swedenconnect.se: frontends: [fe-fre-3.komreg.net, fe-tug-3.komreg.net] @@ -378,22 +381,22 @@ classes: sunet::rsyslog: null sunet::server: *id002 sunetops: null - test_my_eid: &id018 {environment: prod, hostname: test.swedenconnect.se, version: 1.3.1} + test_my_eid: &id019 {environment: prod, hostname: test.swedenconnect.se, version: 1.3.1} eidas-test-2.sveidas.se: autoupdate: null common: null - eid::dockerhost: *id016 + eid::dockerhost: *id017 entropyclient: null infra_ca_rp: null konsulter: null mailclient: *id001 nrpe: null servicemonitor: null - sunet::frontend::register_sites: *id017 + sunet::frontend::register_sites: *id018 sunet::rsyslog: null sunet::server: *id002 sunetops: null - test_my_eid: *id018 + test_my_eid: *id019 eidastest-1.qa.sveidas.se: autoupdate: null common: null @@ -493,7 +496,7 @@ classes: sunetops: null fe-fre-1.test.komreg.net: common: null - eid::dockerhost: &id019 {version: '5:20.10.12~3-0~ubuntu-focal'} + eid::dockerhost: &id020 {version: '5:20.10.12~3-0~ubuntu-focal'} entropyclient: null fe_servers: null infra_ca_rp: null @@ -505,7 +508,7 @@ classes: sunetops: null fe-fre-3.komreg.net: common: null - eid::dockerhost: &id020 {version: '5:20.10.9~3-0~ubuntu-bionic'} + eid::dockerhost: &id021 {version: '5:20.10.9~3-0~ubuntu-bionic'} entropyclient: null fe_servers: null infra_ca_rp: null @@ -517,7 +520,7 @@ classes: sunetops: null fe-tug-1.test.komreg.net: common: null - eid::dockerhost: *id019 + eid::dockerhost: *id020 entropyclient: null fe_servers: null infra_ca_rp: null @@ -529,7 +532,7 @@ classes: sunetops: null fe-tug-3.komreg.net: common: null - eid::dockerhost: *id020 + eid::dockerhost: *id021 entropyclient: null fe_servers: null infra_ca_rp: null @@ -565,7 +568,7 @@ classes: metadatamgrs: null nrpe: null sunet::rsyslog: null - sunet::server: &id021 {ssh_allow_from_anywhere: true} + sunet::server: &id022 {ssh_allow_from_anywhere: true} sunetops: null jump-tug-3.komreg.net: autoupdate: null @@ -578,7 +581,7 @@ classes: metadatamgrs: null nrpe: null sunet::rsyslog: null - sunet::server: *id021 + sunet::server: *id022 sunetops: null kvmdemw-fre-3a.komreg.net: common: null @@ -1267,13 +1270,13 @@ classes: prid-1.sveidas.se: autoupdate: null common: null - eid::dockerhost: &id022 {version: '5:20.10.8~3-0~ubuntu-bionic'} + eid::dockerhost: &id023 {version: '5:20.10.8~3-0~ubuntu-bionic'} entropyclient: null infra_ca_rp: null konsulter: null mailclient: *id001 nrpe: null - prid: &id023 {clients: prid_prod_clients, mdsl: 'https://md.eidas.swedenconnect.se/mdservicelist-aggregate.xml', + prid: &id024 {clients: prid_prod_clients, mdsl: 'https://md.eidas.swedenconnect.se/mdservicelist-aggregate.xml', version: 1.0.4} servicemonitor: null sunet::rsyslog: null @@ -1282,7 +1285,7 @@ classes: prid-1.test.sveidas.se: autoupdate: null common: null - eid::dockerhost: &id024 {version: '5:20.10.6~3-0~ubuntu-focal'} + eid::dockerhost: &id025 {version: '5:20.10.6~3-0~ubuntu-focal'} entropyclient: null infra_ca_rp: null konsulter: null @@ -1295,13 +1298,13 @@ classes: prid-2.sveidas.se: autoupdate: null common: null - eid::dockerhost: *id022 + eid::dockerhost: *id023 entropyclient: null infra_ca_rp: null konsulter: null mailclient: *id001 nrpe: null - prid: *id023 + prid: *id024 servicemonitor: null sunet::rsyslog: null sunet::server: *id002 @@ -1309,7 +1312,7 @@ classes: prid-2.test.sveidas.se: autoupdate: null common: null - eid::dockerhost: *id024 + eid::dockerhost: *id025 entropyclient: null infra_ca_rp: null konsulter: null @@ -1406,13 +1409,13 @@ classes: validator-1.komreg.net: autoupdate: null common: null - eid::dockerhost: &id025 {version: '5:20.10.8~3-0~ubuntu-bionic'} + eid::dockerhost: &id026 {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: &id026 + sunet::frontend::register_sites: &id027 sites: validator.swedenconnect.se: frontends: [fe-fre-3.komreg.net, fe-tug-3.komreg.net] @@ -1420,7 +1423,7 @@ classes: sunet::rsyslog: null sunet::server: *id002 sunetops: null - validator: &id027 {version: 3.0.10} + validator: &id028 {version: 3.0.10} validator-1.qa.komreg.net: autoupdate: null common: null @@ -1443,17 +1446,17 @@ classes: validator-2.komreg.net: autoupdate: null common: null - eid::dockerhost: *id025 + eid::dockerhost: *id026 entropyclient: null infra_ca_rp: null konsulter: null mailclient: *id001 nrpe: null - sunet::frontend::register_sites: *id026 + sunet::frontend::register_sites: *id027 sunet::rsyslog: null sunet::server: *id002 sunetops: null - validator: *id027 + validator: *id028 web-1.qa.sveidas.se: autoupdate: null common: null @@ -1691,6 +1694,7 @@ members: openstack_dockerhost: [web-1.qa.sveidas.se] pages: [web-1.qa.sveidas.se] prid: [prid-1.qa.sveidas.se, prid-1.sveidas.se, prid-2.sveidas.se] + prid_local: [eidas-connector-1.test.sveidas.se, eidas-connector-2.test.sveidas.se] 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]