From d4fa89596178b99bd9d5e59f7b086c1a8af761ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erik=20Bergstro=CC=88m?= <berra@nordu.net>
Date: Thu, 24 May 2018 16:02:37 +0200
Subject: [PATCH] update db
---
global/overlay/etc/puppet/cosmos-db.yaml | 146 +++++++++++++----------
1 file changed, 81 insertions(+), 65 deletions(-)
diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml
index 22030424..4c5e187a 100644
--- a/global/overlay/etc/puppet/cosmos-db.yaml
+++ b/global/overlay/etc/puppet/cosmos-db.yaml
@@ -3,13 +3,13 @@ classes:
autoupdate: null
common: null
eid::dockerhost: null
- eidas_connector: {hostname: connector.eidas.swedenconnect.se, version: 1.3.1}
+ eidas_connector: &id001 {hostname: connector.eidas.swedenconnect.se, version: 1.3.1}
entropyclient: null
infra_ca_rp: null
konsulter: null
- mailclient: &id001 {domain: sunet.se}
+ mailclient: &id002 {domain: sunet.se}
nrpe: null
- sunet::frontend::register_sites:
+ sunet::frontend::register_sites: &id003
sites:
connector.eidas.swedenconnect.se:
frontends: [se-fre-lb-1.sunet.se, se-tug-lb-1.sunet.se]
@@ -17,6 +17,20 @@ classes:
sunet::rsyslog: null
sunet_iaas_cloud: null
sunetops: null
+ eidas-connector-2.sveidas.se:
+ autoupdate: null
+ common: null
+ eid::dockerhost: null
+ eidas_connector: *id001
+ entropyclient: null
+ infra_ca_rp: null
+ konsulter: null
+ mailclient: *id002
+ nrpe: null
+ sunet::frontend::register_sites: *id003
+ sunet::rsyslog: null
+ sunet_iaas_cloud: null
+ sunetops: null
eidas-node-1.qa.sveidas.se:
autoupdate: null
common: null
@@ -24,7 +38,7 @@ classes:
entropyclient: null
infra_ca_rp: null
konsulter: null
- mailclient: *id001
+ mailclient: *id002
nrpe: null
openstack_dockerhost: null
sunet::frontend::register_sites:
@@ -42,7 +56,7 @@ classes:
entropyclient: null
infra_ca_rp: null
konsulter: null
- mailclient: *id001
+ mailclient: *id002
nrpe: null
openstack_dockerhost: null
servicemonitor: null
@@ -59,7 +73,7 @@ classes:
eid::dockerhost: null
entropyclient: null
infra_ca_rp: null
- mailclient: *id001
+ mailclient: *id002
nrpe: null
sunet::frontend::load_balancer: null
sunet::rsyslog: null
@@ -70,7 +84,7 @@ classes:
entropyclient: null
infra_ca_rp: null
konsulter: null
- mailclient: *id001
+ mailclient: *id002
nrpe: null
sunet::rsyslog: null
sunet_iaas_cloud: null
@@ -81,7 +95,7 @@ classes:
entropyclient: null
infra_ca_rp: null
konsulter: null
- mailclient: *id001
+ mailclient: *id002
nrpe: null
sunet::rsyslog: null
sunetops: null
@@ -91,7 +105,7 @@ classes:
entropyclient: null
infra_ca_rp: null
konsulter: null
- mailclient: *id001
+ mailclient: *id002
nrpe: null
sunet::rsyslog: null
sunetops: null
@@ -111,7 +125,7 @@ classes:
search: [sveidas.se]
entropyclient: null
infra_ca_rp: null
- mailclient: *id001
+ mailclient: *id002
nrpe: null
sunet::rsyslog: null
sunetops: null
@@ -131,7 +145,7 @@ classes:
search: [sveidas.se]
entropyclient: null
infra_ca_rp: null
- mailclient: *id001
+ mailclient: *id002
nrpe: null
sunet::rsyslog: null
sunetops: null
@@ -144,7 +158,7 @@ classes:
netmask: 255.255.255.240}
entropyclient: null
infra_ca_rp: null
- mailclient: *id001
+ mailclient: *id002
nrpe: null
sunet::rsyslog: null
sunetops: null
@@ -153,7 +167,7 @@ classes:
eid::kvmhost: null
entropyclient: null
infra_ca_rp: null
- mailclient: *id001
+ mailclient: *id002
nrpe: null
sunet::rsyslog: null
sunetops: null
@@ -166,7 +180,7 @@ classes:
memory: '4096', netmask: 255.255.255.240}
entropyclient: null
infra_ca_rp: null
- mailclient: *id001
+ mailclient: *id002
nrpe: null
sunet::rsyslog: null
sunetops: null
@@ -175,7 +189,7 @@ classes:
eid::kvmhost: null
entropyclient: null
infra_ca_rp: null
- mailclient: *id001
+ mailclient: *id002
nrpe: null
sunet::rsyslog: null
sunetops: null
@@ -188,7 +202,7 @@ classes:
netmask: 255.255.255.240}
entropyclient: null
infra_ca_rp: null
- mailclient: *id001
+ mailclient: *id002
nrpe: null
sunet::rsyslog: null
sunetops: null
@@ -197,7 +211,7 @@ classes:
eid::kvmhost: null
entropyclient: null
infra_ca_rp: null
- mailclient: *id001
+ mailclient: *id002
nrpe: null
sunet::rsyslog: null
sunetops: null
@@ -207,7 +221,7 @@ classes:
entropyclient: null
infra_ca_rp: null
konsulter: null
- mailclient: *id001
+ mailclient: *id002
md_repo_client: null
md_signer: {dest_host: p2.qa.komreg.net, name: eidas-qa}
nrpe: null
@@ -221,7 +235,7 @@ classes:
entropyclient: null
infra_ca_rp: null
konsulter: null
- mailclient: *id001
+ mailclient: *id002
md_repo_client: null
nrpe: null
openstack_dockerhost: null
@@ -232,7 +246,7 @@ classes:
common: null
entropyclient: null
infra_ca_rp: null
- mailclient: *id001
+ mailclient: *id002
md_signer: {dest_host: p1.komreg.net, name: natmd-qa}
nrpe: null
sunet::rsyslog: null
@@ -242,7 +256,7 @@ classes:
common: null
entropyclient: null
infra_ca_rp: null
- mailclient: *id001
+ mailclient: *id002
nagios_monitor: null
nrpe: null
sunet::rsyslog: null
@@ -253,7 +267,7 @@ classes:
entropyclient: null
infra_ca_rp: null
konsulter: null
- mailclient: *id001
+ mailclient: *id002
nagios_monitor: null
nrpe: null
sunet::rsyslog: null
@@ -264,7 +278,7 @@ classes:
common: null
entropyclient: null
infra_ca_rp: null
- mailclient: *id001
+ mailclient: *id002
md_publisher: {keyname: p1.komreg.net_infra}
nrpe: null
sunet::frontend::register_sites:
@@ -280,7 +294,7 @@ classes:
common: null
entropyclient: null
infra_ca_rp: null
- mailclient: *id001
+ mailclient: *id002
md_publisher: {keyname: p2.qa.komreg.net_infra}
nrpe: null
sunet::frontend::register_sites:
@@ -297,7 +311,7 @@ classes:
entropyclient: null
infra_ca_rp: null
konsulter: null
- mailclient: *id001
+ mailclient: *id002
nrpe: null
openstack_dockerhost: null
prid: {version: 1.0.1}
@@ -310,7 +324,7 @@ classes:
common: null
entropyclient: null
infra_ca_rp: null
- mailclient: *id001
+ mailclient: *id002
md_repo_server: {hostname: r1.komreg.net}
nrpe: null
openstack_dockerhost: null
@@ -324,7 +338,7 @@ classes:
entropyclient: null
github_client_credential: null
infra_ca_rp: null
- mailclient: *id001
+ mailclient: *id002
nrpe: null
openstack_dockerhost: null
pages: null
@@ -337,51 +351,51 @@ classes:
sunet_iaas_cloud: null
sunetops: null
members:
- all: [eidas-connector-1.sveidas.se, eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se,
- fe-fre-3.komreg.net, jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.komreg.net,
- kvmeidas-fre-3.komreg.net, kvmeidas-tug-3.komreg.net, kvmfe-fre-3.komreg.net,
+ all: [eidas-connector-1.sveidas.se, eidas-connector-2.sveidas.se, eidas-node-1.qa.sveidas.se,
+ eidas-proxy-1.qa.sveidas.se, fe-fre-3.komreg.net, jmp.komreg.net, jump-fre-3.komreg.net,
+ jump-tug-3.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, md-eu1.qa.komreg.net, md-fre-3.komreg.net,
md1.komreg.net, monitor-fre-3.komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.komreg.net,
prid-1.qa.sveidas.se, r1.komreg.net, web-1.qa.sveidas.se]
- autoupdate: [eidas-connector-1.sveidas.se, eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se,
- jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.komreg.net, md-eu1.qa.komreg.net,
- md-fre-3.komreg.net, monitor-fre-3.komreg.net, nic.komreg.net, p1.komreg.net,
- p2.qa.komreg.net, prid-1.qa.sveidas.se, r1.komreg.net, web-1.qa.sveidas.se]
- common: [eidas-connector-1.sveidas.se, eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se,
- fe-fre-3.komreg.net, jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.komreg.net,
- kvmeidas-fre-3.komreg.net, kvmeidas-tug-3.komreg.net, kvmfe-fre-3.komreg.net,
+ autoupdate: [eidas-connector-1.sveidas.se, eidas-connector-2.sveidas.se, eidas-node-1.qa.sveidas.se,
+ eidas-proxy-1.qa.sveidas.se, jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.komreg.net,
+ md-eu1.qa.komreg.net, md-fre-3.komreg.net, monitor-fre-3.komreg.net, nic.komreg.net,
+ p1.komreg.net, p2.qa.komreg.net, prid-1.qa.sveidas.se, r1.komreg.net, web-1.qa.sveidas.se]
+ common: [eidas-connector-1.sveidas.se, eidas-connector-2.sveidas.se, eidas-node-1.qa.sveidas.se,
+ eidas-proxy-1.qa.sveidas.se, fe-fre-3.komreg.net, jmp.komreg.net, jump-fre-3.komreg.net,
+ jump-tug-3.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, md-eu1.qa.komreg.net, md-fre-3.komreg.net,
md1.komreg.net, monitor-fre-3.komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.komreg.net,
prid-1.qa.sveidas.se, r1.komreg.net, web-1.qa.sveidas.se]
- eid::dockerhost: [eidas-connector-1.sveidas.se, fe-fre-3.komreg.net]
+ eid::dockerhost: [eidas-connector-1.sveidas.se, eidas-connector-2.sveidas.se, fe-fre-3.komreg.net]
eid::kvmhost: [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]
- eidas_connector: [eidas-connector-1.sveidas.se, eidas-node-1.qa.sveidas.se]
+ eidas_connector: [eidas-connector-1.sveidas.se, eidas-connector-2.sveidas.se, eidas-node-1.qa.sveidas.se]
eidas_proxy: [eidas-proxy-1.qa.sveidas.se]
- entropyclient: [eidas-connector-1.sveidas.se, eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se,
- fe-fre-3.komreg.net, jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.komreg.net,
- kvmeidas-fre-3.komreg.net, kvmeidas-tug-3.komreg.net, kvmfe-fre-3.komreg.net,
+ entropyclient: [eidas-connector-1.sveidas.se, eidas-connector-2.sveidas.se, eidas-node-1.qa.sveidas.se,
+ eidas-proxy-1.qa.sveidas.se, fe-fre-3.komreg.net, jmp.komreg.net, jump-fre-3.komreg.net,
+ jump-tug-3.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, md-eu1.qa.komreg.net, md-fre-3.komreg.net,
md1.komreg.net, monitor-fre-3.komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.komreg.net,
prid-1.qa.sveidas.se, r1.komreg.net, web-1.qa.sveidas.se]
github_client_credential: [web-1.qa.sveidas.se]
- infra_ca_rp: [eidas-connector-1.sveidas.se, eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se,
- fe-fre-3.komreg.net, jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.komreg.net,
- kvmeidas-fre-3.komreg.net, kvmeidas-tug-3.komreg.net, kvmfe-fre-3.komreg.net,
+ infra_ca_rp: [eidas-connector-1.sveidas.se, eidas-connector-2.sveidas.se, eidas-node-1.qa.sveidas.se,
+ eidas-proxy-1.qa.sveidas.se, fe-fre-3.komreg.net, jmp.komreg.net, jump-fre-3.komreg.net,
+ jump-tug-3.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, md-eu1.qa.komreg.net, md-fre-3.komreg.net,
md1.komreg.net, monitor-fre-3.komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.komreg.net,
prid-1.qa.sveidas.se, r1.komreg.net, web-1.qa.sveidas.se]
- konsulter: [eidas-connector-1.sveidas.se, eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se,
- jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.komreg.net, md-eu1.qa.komreg.net,
- md-fre-3.komreg.net, nic.komreg.net, prid-1.qa.sveidas.se]
- mailclient: [eidas-connector-1.sveidas.se, eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se,
- fe-fre-3.komreg.net, jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.komreg.net,
- kvmeidas-fre-3.komreg.net, kvmeidas-tug-3.komreg.net, kvmfe-fre-3.komreg.net,
+ konsulter: [eidas-connector-1.sveidas.se, eidas-connector-2.sveidas.se, eidas-node-1.qa.sveidas.se,
+ eidas-proxy-1.qa.sveidas.se, jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.komreg.net,
+ md-eu1.qa.komreg.net, md-fre-3.komreg.net, nic.komreg.net, prid-1.qa.sveidas.se]
+ mailclient: [eidas-connector-1.sveidas.se, eidas-connector-2.sveidas.se, eidas-node-1.qa.sveidas.se,
+ eidas-proxy-1.qa.sveidas.se, fe-fre-3.komreg.net, jmp.komreg.net, jump-fre-3.komreg.net,
+ jump-tug-3.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, md-eu1.qa.komreg.net, md-fre-3.komreg.net,
md1.komreg.net, monitor-fre-3.komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.komreg.net,
@@ -391,9 +405,9 @@ members:
md_repo_server: [r1.komreg.net]
md_signer: [md-eu1.qa.komreg.net, md1.komreg.net]
nagios_monitor: [monitor-fre-3.komreg.net, nic.komreg.net]
- nrpe: [eidas-connector-1.sveidas.se, eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se,
- fe-fre-3.komreg.net, jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.komreg.net,
- kvmeidas-fre-3.komreg.net, kvmeidas-tug-3.komreg.net, kvmfe-fre-3.komreg.net,
+ nrpe: [eidas-connector-1.sveidas.se, eidas-connector-2.sveidas.se, eidas-node-1.qa.sveidas.se,
+ eidas-proxy-1.qa.sveidas.se, fe-fre-3.komreg.net, jmp.komreg.net, jump-fre-3.komreg.net,
+ jump-tug-3.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, md-eu1.qa.komreg.net, md-fre-3.komreg.net,
md1.komreg.net, monitor-fre-3.komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.komreg.net,
@@ -406,21 +420,23 @@ members:
servicemonitor: [eidas-proxy-1.qa.sveidas.se, prid-1.qa.sveidas.se]
sunet::dehydrated: [r1.komreg.net]
sunet::frontend::load_balancer: [fe-fre-3.komreg.net]
- sunet::frontend::register_sites: [eidas-connector-1.sveidas.se, eidas-node-1.qa.sveidas.se,
- eidas-proxy-1.qa.sveidas.se, p1.komreg.net, p2.qa.komreg.net, web-1.qa.sveidas.se]
- sunet::rsyslog: [eidas-connector-1.sveidas.se, eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se,
- fe-fre-3.komreg.net, jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.komreg.net,
- kvmeidas-fre-3.komreg.net, kvmeidas-tug-3.komreg.net, kvmfe-fre-3.komreg.net,
+ sunet::frontend::register_sites: [eidas-connector-1.sveidas.se, eidas-connector-2.sveidas.se,
+ eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se, p1.komreg.net, p2.qa.komreg.net,
+ web-1.qa.sveidas.se]
+ sunet::rsyslog: [eidas-connector-1.sveidas.se, eidas-connector-2.sveidas.se, eidas-node-1.qa.sveidas.se,
+ eidas-proxy-1.qa.sveidas.se, fe-fre-3.komreg.net, jmp.komreg.net, jump-fre-3.komreg.net,
+ jump-tug-3.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, md-eu1.qa.komreg.net, md-fre-3.komreg.net,
md1.komreg.net, monitor-fre-3.komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.komreg.net,
prid-1.qa.sveidas.se, r1.komreg.net, web-1.qa.sveidas.se]
- sunet_iaas_cloud: [eidas-connector-1.sveidas.se, eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se,
- jmp.komreg.net, md-eu1.qa.komreg.net, md-fre-3.komreg.net, nic.komreg.net, p1.komreg.net,
- p2.qa.komreg.net, prid-1.qa.sveidas.se, r1.komreg.net, web-1.qa.sveidas.se]
- sunetops: [eidas-connector-1.sveidas.se, eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se,
- fe-fre-3.komreg.net, jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.komreg.net,
- kvmeidas-fre-3.komreg.net, kvmeidas-tug-3.komreg.net, kvmfe-fre-3.komreg.net,
+ sunet_iaas_cloud: [eidas-connector-1.sveidas.se, eidas-connector-2.sveidas.se, eidas-node-1.qa.sveidas.se,
+ eidas-proxy-1.qa.sveidas.se, jmp.komreg.net, md-eu1.qa.komreg.net, md-fre-3.komreg.net,
+ nic.komreg.net, p1.komreg.net, p2.qa.komreg.net, prid-1.qa.sveidas.se, r1.komreg.net,
+ web-1.qa.sveidas.se]
+ sunetops: [eidas-connector-1.sveidas.se, eidas-connector-2.sveidas.se, eidas-node-1.qa.sveidas.se,
+ eidas-proxy-1.qa.sveidas.se, fe-fre-3.komreg.net, jmp.komreg.net, jump-fre-3.komreg.net,
+ jump-tug-3.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, md-eu1.qa.komreg.net, md-fre-3.komreg.net,
md1.komreg.net, monitor-fre-3.komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.komreg.net,