From 3dcc5181e6164cff65d220665dd48f1a1231a09b Mon Sep 17 00:00:00 2001 From: Maria Haider Date: Tue, 19 Jun 2018 12:41:14 +0200 Subject: [PATCH 01/13] Added configurations for four new redis virtual machines in cosmos-rules.yaml --- global/overlay/etc/puppet/cosmos-rules.yaml | 40 +++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml index f29807c1..9db37fa5 100644 --- a/global/overlay/etc/puppet/cosmos-rules.yaml +++ b/global/overlay/etc/puppet/cosmos-rules.yaml @@ -68,6 +68,36 @@ kvmeidas-tug-3.komreg.net: description: 'eid prid' cpus: '4' memory: '4096' + eidas-redis-fe-2.sveidas.se: + mac: '52:54:20:02:04:03' + ip: '94.176.224.7' + netmask: '255.255.255.240' + gateway: '94.176.224.1' + bridge: 'br-eidas' + search: ['sveidas.se'] + description: 'eid tug redis frontend' + cpus: '4' + memory: '4096' + eidas-redis-2.sveidas.se: + mac: '52:54:20:02:04:05' + ip: '94.176.224.9' + netmask: '255.255.255.240' + gateway: '94.176.224.1' + bridge: 'br-eidas' + search: ['sveidas.se'] + description: 'eid tug redis cluster' + cpus: '4' + memory: '4096' + eidas-redis-4.sveidas.se: + mac: '52:54:20:02:04:06' + ip: '94.176.224.10' + netmask: '255.255.255.240' + gateway: '94.176.224.1' + bridge: 'br-eidas' + search: ['sveidas.se'] + description: 'eid tug redis cluster' + cpus: '4' + memory: '4096' kvmfe-fre-3.komreg.net: eid::kvmhost: @@ -141,6 +171,16 @@ kvmeidas-fre-3.komreg.net: description: 'eid fre redis cluster' cpus: '4' memory: '4096' + eidas-redis-3.sveidas.se: + mac: '52:54:20:01:04:06' + ip: '94.176.224.138' + netmask: '255.255.255.240' + gateway: '94.176.224.129' + bridge: 'br-eidas' + search: ['sveidas.se'] + description: 'eid fre redis cluster' + cpus: '4' + memory: '4096' prid-1.sveidas.se: mac: '52:54:20:01:04:04' ip: '94.176.224.136' From 03140a95b8367a6b8fe592140dbf138536a87ab4 Mon Sep 17 00:00:00 2001 From: Maria Haider Date: Tue, 19 Jun 2018 12:44:27 +0200 Subject: [PATCH 02/13] Fixed syntax --- global/overlay/etc/puppet/cosmos-rules.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml index 9db37fa5..9eae343e 100644 --- a/global/overlay/etc/puppet/cosmos-rules.yaml +++ b/global/overlay/etc/puppet/cosmos-rules.yaml @@ -68,7 +68,7 @@ kvmeidas-tug-3.komreg.net: description: 'eid prid' cpus: '4' memory: '4096' - eidas-redis-fe-2.sveidas.se: + eidas-redis-fe-2.sveidas.se: mac: '52:54:20:02:04:03' ip: '94.176.224.7' netmask: '255.255.255.240' @@ -78,7 +78,7 @@ kvmeidas-tug-3.komreg.net: description: 'eid tug redis frontend' cpus: '4' memory: '4096' - eidas-redis-2.sveidas.se: + eidas-redis-2.sveidas.se: mac: '52:54:20:02:04:05' ip: '94.176.224.9' netmask: '255.255.255.240' @@ -88,7 +88,7 @@ kvmeidas-tug-3.komreg.net: description: 'eid tug redis cluster' cpus: '4' memory: '4096' - eidas-redis-4.sveidas.se: + eidas-redis-4.sveidas.se: mac: '52:54:20:02:04:06' ip: '94.176.224.10' netmask: '255.255.255.240' From 222c0daf668c5350f0e9b9c7e6e3d968bce04f3a Mon Sep 17 00:00:00 2001 From: Maria Haider Date: Tue, 19 Jun 2018 12:44:32 +0200 Subject: [PATCH 03/13] update db --- global/overlay/etc/puppet/cosmos-db.yaml | 40 ++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml index eebea226..a89c5241 100644 --- a/global/overlay/etc/puppet/cosmos-db.yaml +++ b/global/overlay/etc/puppet/cosmos-db.yaml @@ -200,6 +200,16 @@ classes: memory: '4096' netmask: 255.255.255.240 search: [sveidas.se] + eidas-redis-3.sveidas.se: + bridge: br-eidas + cpus: '4' + description: eid fre redis cluster + gateway: 94.176.224.129 + ip: 94.176.224.138 + mac: '52:54:20:01:04:06' + memory: '4096' + netmask: 255.255.255.240 + search: [sveidas.se] eidas-redis-fe-1.sveidas.se: bridge: br-eidas cpus: '4' @@ -250,6 +260,36 @@ classes: memory: '4096' netmask: 255.255.255.240 search: [sveidas.se] + eidas-redis-2.sveidas.se: + bridge: br-eidas + cpus: '4' + description: eid tug redis cluster + gateway: 94.176.224.1 + ip: 94.176.224.9 + mac: '52:54:20:02:04:05' + memory: '4096' + netmask: 255.255.255.240 + search: [sveidas.se] + eidas-redis-4.sveidas.se: + bridge: br-eidas + cpus: '4' + description: eid tug redis cluster + gateway: 94.176.224.1 + ip: 94.176.224.10 + mac: '52:54:20:02:04:06' + memory: '4096' + netmask: 255.255.255.240 + search: [sveidas.se] + eidas-redis-fe-2.sveidas.se: + bridge: br-eidas + cpus: '4' + description: eid tug redis frontend + gateway: 94.176.224.1 + ip: 94.176.224.7 + mac: '52:54:20:02:04:03' + memory: '4096' + netmask: 255.255.255.240 + search: [sveidas.se] prid-2.sveidas.se: bridge: br-eidas cpus: '4' From 71d1ee0daf4eb54388ff053b28ae4ea474d2c78f Mon Sep 17 00:00:00 2001 From: Maria Haider Date: Tue, 19 Jun 2018 15:45:49 +0200 Subject: [PATCH 04/13] eidas-redis-3.sveidas.se added --- eidas-redis-3.sveidas.se/README | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 eidas-redis-3.sveidas.se/README diff --git a/eidas-redis-3.sveidas.se/README b/eidas-redis-3.sveidas.se/README new file mode 100644 index 00000000..a18dac1c --- /dev/null +++ b/eidas-redis-3.sveidas.se/README @@ -0,0 +1,3 @@ + +The system documentation is in the docs directory of the multiverse repository. + From 4e41f3e116829723c00e407ff87b86164218f4d2 Mon Sep 17 00:00:00 2001 From: Maria Haider Date: Tue, 19 Jun 2018 15:47:39 +0200 Subject: [PATCH 05/13] update db --- global/overlay/etc/puppet/cosmos-db.yaml | 156 ++++++++++++----------- 1 file changed, 84 insertions(+), 72 deletions(-) diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml index a89c5241..6cd79e37 100644 --- a/global/overlay/etc/puppet/cosmos-db.yaml +++ b/global/overlay/etc/puppet/cosmos-db.yaml @@ -103,6 +103,17 @@ classes: redis_cluster_node: null sunet::rsyslog: null sunetops: null + eidas-redis-3.sveidas.se: + autoupdate: null + common: null + eid::dockerhost: null + entropyclient: null + infra_ca_rp: null + mailclient: *id002 + nrpe: null + redis_cluster_node: null + sunet::rsyslog: null + sunetops: null eidas-redis-fe-1.sveidas.se: autoupdate: null common: null @@ -567,34 +578,35 @@ classes: members: all: [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-redis-1.sveidas.se, eidas-redis-fe-1.sveidas.se, fe-fre-3.komreg.net, fe-tug-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, - log.qa.sveidas.se, 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, - prid-1.sveidas.se, prid-2.sveidas.se, r1.komreg.net, validator-1.qa.komreg.net, - web-1.qa.sveidas.se] + eidas-redis-1.sveidas.se, eidas-redis-3.sveidas.se, eidas-redis-fe-1.sveidas.se, + fe-fre-3.komreg.net, fe-tug-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, log.qa.sveidas.se, 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, prid-1.sveidas.se, prid-2.sveidas.se, + r1.komreg.net, validator-1.qa.komreg.net, web-1.qa.sveidas.se] autoupdate: [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-redis-1.sveidas.se, eidas-redis-fe-1.sveidas.se, jmp.komreg.net, jump-fre-3.komreg.net, - jump-tug-3.komreg.net, log.qa.sveidas.se, 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, - prid-1.sveidas.se, prid-2.sveidas.se, r1.komreg.net, validator-1.qa.komreg.net, - web-1.qa.sveidas.se] + eidas-redis-1.sveidas.se, eidas-redis-3.sveidas.se, eidas-redis-fe-1.sveidas.se, + jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.komreg.net, log.qa.sveidas.se, + 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, prid-1.sveidas.se, prid-2.sveidas.se, + r1.komreg.net, validator-1.qa.komreg.net, web-1.qa.sveidas.se] common: [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-redis-1.sveidas.se, eidas-redis-fe-1.sveidas.se, fe-fre-3.komreg.net, fe-tug-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, - log.qa.sveidas.se, 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, - prid-1.sveidas.se, prid-2.sveidas.se, r1.komreg.net, validator-1.qa.komreg.net, - web-1.qa.sveidas.se] + eidas-redis-1.sveidas.se, eidas-redis-3.sveidas.se, eidas-redis-fe-1.sveidas.se, + fe-fre-3.komreg.net, fe-tug-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, log.qa.sveidas.se, 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, prid-1.sveidas.se, prid-2.sveidas.se, + r1.komreg.net, validator-1.qa.komreg.net, web-1.qa.sveidas.se] eid::dockerhost: [eidas-connector-1.sveidas.se, eidas-connector-2.sveidas.se, eidas-connector-3.sveidas.se, - eidas-connector-4.sveidas.se, eidas-redis-1.sveidas.se, eidas-redis-fe-1.sveidas.se, - fe-fre-3.komreg.net, fe-tug-3.komreg.net, prid-1.sveidas.se, prid-2.sveidas.se] + eidas-connector-4.sveidas.se, eidas-redis-1.sveidas.se, eidas-redis-3.sveidas.se, + eidas-redis-fe-1.sveidas.se, fe-fre-3.komreg.net, fe-tug-3.komreg.net, prid-1.sveidas.se, + prid-2.sveidas.se] 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, kvmmeta-fre-3.komreg.net] eidas_connector: [eidas-connector-1.sveidas.se, eidas-connector-2.sveidas.se, eidas-connector-3.sveidas.se, @@ -602,25 +614,25 @@ members: eidas_proxy: [eidas-proxy-1.qa.sveidas.se] entropyclient: [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-redis-1.sveidas.se, eidas-redis-fe-1.sveidas.se, fe-fre-3.komreg.net, fe-tug-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, - log.qa.sveidas.se, 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, - prid-1.sveidas.se, prid-2.sveidas.se, r1.komreg.net, validator-1.qa.komreg.net, - web-1.qa.sveidas.se] + eidas-redis-1.sveidas.se, eidas-redis-3.sveidas.se, eidas-redis-fe-1.sveidas.se, + fe-fre-3.komreg.net, fe-tug-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, log.qa.sveidas.se, 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, prid-1.sveidas.se, prid-2.sveidas.se, + r1.komreg.net, validator-1.qa.komreg.net, web-1.qa.sveidas.se] github_client_credential: [web-1.qa.sveidas.se] infra_ca_rp: [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-redis-1.sveidas.se, eidas-redis-fe-1.sveidas.se, fe-fre-3.komreg.net, fe-tug-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, - log.qa.sveidas.se, 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, - prid-1.sveidas.se, prid-2.sveidas.se, r1.komreg.net, validator-1.qa.komreg.net, - web-1.qa.sveidas.se] + eidas-redis-1.sveidas.se, eidas-redis-3.sveidas.se, eidas-redis-fe-1.sveidas.se, + fe-fre-3.komreg.net, fe-tug-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, log.qa.sveidas.se, 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, prid-1.sveidas.se, prid-2.sveidas.se, + r1.komreg.net, validator-1.qa.komreg.net, web-1.qa.sveidas.se] konsulter: [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, jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.komreg.net, md-eu1.qa.komreg.net, @@ -628,14 +640,14 @@ members: prid-2.sveidas.se, validator-1.qa.komreg.net] mailclient: [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-redis-1.sveidas.se, eidas-redis-fe-1.sveidas.se, fe-fre-3.komreg.net, fe-tug-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, - log.qa.sveidas.se, 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, - prid-1.sveidas.se, prid-2.sveidas.se, r1.komreg.net, validator-1.qa.komreg.net, - web-1.qa.sveidas.se] + eidas-redis-1.sveidas.se, eidas-redis-3.sveidas.se, eidas-redis-fe-1.sveidas.se, + fe-fre-3.komreg.net, fe-tug-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, log.qa.sveidas.se, 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, prid-1.sveidas.se, prid-2.sveidas.se, + r1.komreg.net, validator-1.qa.komreg.net, web-1.qa.sveidas.se] md_publisher: [p1.komreg.net, p2.qa.komreg.net] md_repo_client: [md-eu1.qa.komreg.net, md-fre-3.komreg.net] md_repo_server: [r1.komreg.net] @@ -643,20 +655,20 @@ members: nagios_monitor: [monitor-fre-3.komreg.net, nic.komreg.net] nrpe: [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-redis-1.sveidas.se, eidas-redis-fe-1.sveidas.se, fe-fre-3.komreg.net, fe-tug-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, - log.qa.sveidas.se, 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, - prid-1.sveidas.se, prid-2.sveidas.se, r1.komreg.net, validator-1.qa.komreg.net, - web-1.qa.sveidas.se] + eidas-redis-1.sveidas.se, eidas-redis-3.sveidas.se, eidas-redis-fe-1.sveidas.se, + fe-fre-3.komreg.net, fe-tug-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, log.qa.sveidas.se, 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, prid-1.sveidas.se, prid-2.sveidas.se, + r1.komreg.net, validator-1.qa.komreg.net, web-1.qa.sveidas.se] openstack_dockerhost: [eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se, md-eu1.qa.komreg.net, md-fre-3.komreg.net, prid-1.qa.sveidas.se, r1.komreg.net, validator-1.qa.komreg.net, 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] - redis_cluster_node: [eidas-redis-1.sveidas.se] + redis_cluster_node: [eidas-redis-1.sveidas.se, eidas-redis-3.sveidas.se] redis_frontend_node: [eidas-redis-fe-1.sveidas.se] servicemonitor: [eidas-proxy-1.qa.sveidas.se, prid-1.qa.sveidas.se, prid-1.sveidas.se, prid-2.sveidas.se, validator-1.qa.komreg.net] @@ -669,27 +681,27 @@ members: web-1.qa.sveidas.se] sunet::rsyslog: [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-redis-1.sveidas.se, eidas-redis-fe-1.sveidas.se, fe-fre-3.komreg.net, fe-tug-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, - log.qa.sveidas.se, log.qa.sveidas.se, 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, prid-1.sveidas.se, prid-2.sveidas.se, r1.komreg.net, validator-1.qa.komreg.net, - web-1.qa.sveidas.se] + eidas-redis-1.sveidas.se, eidas-redis-3.sveidas.se, eidas-redis-fe-1.sveidas.se, + fe-fre-3.komreg.net, fe-tug-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, log.qa.sveidas.se, log.qa.sveidas.se, + 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, prid-1.sveidas.se, + prid-2.sveidas.se, r1.komreg.net, validator-1.qa.komreg.net, web-1.qa.sveidas.se] sunet_iaas_cloud: [eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se, jmp.komreg.net, log.qa.sveidas.se, 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, validator-1.qa.komreg.net, web-1.qa.sveidas.se] sunetops: [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-redis-1.sveidas.se, eidas-redis-fe-1.sveidas.se, fe-fre-3.komreg.net, fe-tug-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, - log.qa.sveidas.se, 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, - prid-1.sveidas.se, prid-2.sveidas.se, r1.komreg.net, validator-1.qa.komreg.net, - web-1.qa.sveidas.se] + eidas-redis-1.sveidas.se, eidas-redis-3.sveidas.se, eidas-redis-fe-1.sveidas.se, + fe-fre-3.komreg.net, fe-tug-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, log.qa.sveidas.se, 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, prid-1.sveidas.se, prid-2.sveidas.se, + r1.komreg.net, validator-1.qa.komreg.net, web-1.qa.sveidas.se] validator: [validator-1.qa.komreg.net] From 87d53790a00d92b5298af2ef5ef5aa9b4d59fbdc Mon Sep 17 00:00:00 2001 From: Maria Haider Date: Tue, 19 Jun 2018 15:51:42 +0200 Subject: [PATCH 06/13] Added a new sentinetl(redis cluster) ip in common.yaml file --- global/overlay/etc/hiera/data/common.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/global/overlay/etc/hiera/data/common.yaml b/global/overlay/etc/hiera/data/common.yaml index 2c79246e..4ffceb93 100644 --- a/global/overlay/etc/hiera/data/common.yaml +++ b/global/overlay/etc/hiera/data/common.yaml @@ -60,3 +60,4 @@ redis_client_ips: - 94.176.224.137 redis_sentinel_ips: - 94.176.224.135 + - 94.176.224.138 From 522cf34db7475e54dfba4babe55482999d03e04a Mon Sep 17 00:00:00 2001 From: Maria Haider Date: Wed, 20 Jun 2018 09:35:28 +0200 Subject: [PATCH 07/13] Added new client_ips and sentinel_ips in common.yaml file --- global/overlay/etc/hiera/data/common.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/global/overlay/etc/hiera/data/common.yaml b/global/overlay/etc/hiera/data/common.yaml index 4ffceb93..946a24d7 100644 --- a/global/overlay/etc/hiera/data/common.yaml +++ b/global/overlay/etc/hiera/data/common.yaml @@ -58,6 +58,9 @@ ssh_authorized_keys: redis_client_ips: - 94.176.224.137 + - 94.176.224.7 redis_sentinel_ips: - 94.176.224.135 - 94.176.224.138 + - 94.176.224.9 + - 94.176.224.10 From be35b3fbbaa7c6b183d86525d74e7171360088ee Mon Sep 17 00:00:00 2001 From: Maria Haider Date: Wed, 20 Jun 2018 09:36:56 +0200 Subject: [PATCH 08/13] eidas-redis-fe-2.sveidas.se added --- eidas-redis-fe-2.sveidas.se/README | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 eidas-redis-fe-2.sveidas.se/README diff --git a/eidas-redis-fe-2.sveidas.se/README b/eidas-redis-fe-2.sveidas.se/README new file mode 100644 index 00000000..a18dac1c --- /dev/null +++ b/eidas-redis-fe-2.sveidas.se/README @@ -0,0 +1,3 @@ + +The system documentation is in the docs directory of the multiverse repository. + From 8524fc2643a19351f1caf7408c68be50fa9e88d5 Mon Sep 17 00:00:00 2001 From: Maria Haider Date: Wed, 20 Jun 2018 09:38:54 +0200 Subject: [PATCH 09/13] update db --- global/overlay/etc/puppet/cosmos-db.yaml | 79 ++++++++++++++---------- 1 file changed, 45 insertions(+), 34 deletions(-) diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml index 6cd79e37..c0d2486d 100644 --- a/global/overlay/etc/puppet/cosmos-db.yaml +++ b/global/overlay/etc/puppet/cosmos-db.yaml @@ -122,7 +122,18 @@ classes: infra_ca_rp: null mailclient: *id002 nrpe: null - redis_frontend_node: {hostname: redis.sveidas.se} + redis_frontend_node: &id004 {hostname: redis.sveidas.se} + sunet::rsyslog: null + sunetops: null + eidas-redis-fe-2.sveidas.se: + autoupdate: null + common: null + eid::dockerhost: null + entropyclient: null + infra_ca_rp: null + mailclient: *id002 + nrpe: null + redis_frontend_node: *id004 sunet::rsyslog: null sunetops: null fe-fre-3.komreg.net: @@ -508,7 +519,7 @@ classes: konsulter: null mailclient: *id002 nrpe: null - prid: &id004 {clients: prid_prod_clients, version: 1.0.1} + prid: &id005 {clients: prid_prod_clients, version: 1.0.1} servicemonitor: null sunet::rsyslog: null sunetops: null @@ -521,7 +532,7 @@ classes: konsulter: null mailclient: *id002 nrpe: null - prid: *id004 + prid: *id005 servicemonitor: null sunet::rsyslog: null sunetops: null @@ -579,9 +590,9 @@ members: all: [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-redis-1.sveidas.se, eidas-redis-3.sveidas.se, eidas-redis-fe-1.sveidas.se, - fe-fre-3.komreg.net, fe-tug-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, + eidas-redis-fe-2.sveidas.se, fe-fre-3.komreg.net, fe-tug-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, log.qa.sveidas.se, 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, prid-1.sveidas.se, prid-2.sveidas.se, @@ -589,24 +600,24 @@ members: autoupdate: [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-redis-1.sveidas.se, eidas-redis-3.sveidas.se, eidas-redis-fe-1.sveidas.se, - jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.komreg.net, log.qa.sveidas.se, - 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, prid-1.sveidas.se, prid-2.sveidas.se, - r1.komreg.net, validator-1.qa.komreg.net, web-1.qa.sveidas.se] + eidas-redis-fe-2.sveidas.se, jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.komreg.net, + log.qa.sveidas.se, 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, prid-1.sveidas.se, + prid-2.sveidas.se, r1.komreg.net, validator-1.qa.komreg.net, web-1.qa.sveidas.se] common: [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-redis-1.sveidas.se, eidas-redis-3.sveidas.se, eidas-redis-fe-1.sveidas.se, - fe-fre-3.komreg.net, fe-tug-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, + eidas-redis-fe-2.sveidas.se, fe-fre-3.komreg.net, fe-tug-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, log.qa.sveidas.se, 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, prid-1.sveidas.se, prid-2.sveidas.se, r1.komreg.net, validator-1.qa.komreg.net, web-1.qa.sveidas.se] eid::dockerhost: [eidas-connector-1.sveidas.se, eidas-connector-2.sveidas.se, eidas-connector-3.sveidas.se, eidas-connector-4.sveidas.se, eidas-redis-1.sveidas.se, eidas-redis-3.sveidas.se, - eidas-redis-fe-1.sveidas.se, fe-fre-3.komreg.net, fe-tug-3.komreg.net, prid-1.sveidas.se, - prid-2.sveidas.se] + eidas-redis-fe-1.sveidas.se, eidas-redis-fe-2.sveidas.se, fe-fre-3.komreg.net, + fe-tug-3.komreg.net, prid-1.sveidas.se, prid-2.sveidas.se] 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, kvmmeta-fre-3.komreg.net] eidas_connector: [eidas-connector-1.sveidas.se, eidas-connector-2.sveidas.se, eidas-connector-3.sveidas.se, @@ -615,9 +626,9 @@ members: entropyclient: [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-redis-1.sveidas.se, eidas-redis-3.sveidas.se, eidas-redis-fe-1.sveidas.se, - fe-fre-3.komreg.net, fe-tug-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, + eidas-redis-fe-2.sveidas.se, fe-fre-3.komreg.net, fe-tug-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, log.qa.sveidas.se, 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, prid-1.sveidas.se, prid-2.sveidas.se, @@ -626,9 +637,9 @@ members: infra_ca_rp: [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-redis-1.sveidas.se, eidas-redis-3.sveidas.se, eidas-redis-fe-1.sveidas.se, - fe-fre-3.komreg.net, fe-tug-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, + eidas-redis-fe-2.sveidas.se, fe-fre-3.komreg.net, fe-tug-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, log.qa.sveidas.se, 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, prid-1.sveidas.se, prid-2.sveidas.se, @@ -641,9 +652,9 @@ members: mailclient: [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-redis-1.sveidas.se, eidas-redis-3.sveidas.se, eidas-redis-fe-1.sveidas.se, - fe-fre-3.komreg.net, fe-tug-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, + eidas-redis-fe-2.sveidas.se, fe-fre-3.komreg.net, fe-tug-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, log.qa.sveidas.se, 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, prid-1.sveidas.se, prid-2.sveidas.se, @@ -656,9 +667,9 @@ members: nrpe: [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-redis-1.sveidas.se, eidas-redis-3.sveidas.se, eidas-redis-fe-1.sveidas.se, - fe-fre-3.komreg.net, fe-tug-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, + eidas-redis-fe-2.sveidas.se, fe-fre-3.komreg.net, fe-tug-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, log.qa.sveidas.se, 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, prid-1.sveidas.se, prid-2.sveidas.se, @@ -669,7 +680,7 @@ members: pages: [web-1.qa.sveidas.se] prid: [prid-1.qa.sveidas.se, prid-1.sveidas.se, prid-2.sveidas.se] redis_cluster_node: [eidas-redis-1.sveidas.se, eidas-redis-3.sveidas.se] - redis_frontend_node: [eidas-redis-fe-1.sveidas.se] + redis_frontend_node: [eidas-redis-fe-1.sveidas.se, eidas-redis-fe-2.sveidas.se] servicemonitor: [eidas-proxy-1.qa.sveidas.se, prid-1.qa.sveidas.se, prid-1.sveidas.se, prid-2.sveidas.se, validator-1.qa.komreg.net] sunet::auditd: [jmp.komreg.net] @@ -682,9 +693,9 @@ members: sunet::rsyslog: [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-redis-1.sveidas.se, eidas-redis-3.sveidas.se, eidas-redis-fe-1.sveidas.se, - fe-fre-3.komreg.net, fe-tug-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, + eidas-redis-fe-2.sveidas.se, fe-fre-3.komreg.net, fe-tug-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, log.qa.sveidas.se, log.qa.sveidas.se, 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, prid-1.sveidas.se, @@ -696,9 +707,9 @@ members: sunetops: [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-redis-1.sveidas.se, eidas-redis-3.sveidas.se, eidas-redis-fe-1.sveidas.se, - fe-fre-3.komreg.net, fe-tug-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, + eidas-redis-fe-2.sveidas.se, fe-fre-3.komreg.net, fe-tug-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, log.qa.sveidas.se, 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, prid-1.sveidas.se, prid-2.sveidas.se, From 9ae197cc8e41025cc8ebdde89c24e1515e9f0459 Mon Sep 17 00:00:00 2001 From: Maria Haider Date: Wed, 20 Jun 2018 09:39:19 +0200 Subject: [PATCH 10/13] eidas-redis-2.sveidas.se added --- eidas-redis-2.sveidas.se/README | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 eidas-redis-2.sveidas.se/README diff --git a/eidas-redis-2.sveidas.se/README b/eidas-redis-2.sveidas.se/README new file mode 100644 index 00000000..a18dac1c --- /dev/null +++ b/eidas-redis-2.sveidas.se/README @@ -0,0 +1,3 @@ + +The system documentation is in the docs directory of the multiverse repository. + From 1c547e0d8cf6876b68706732b977fdcfdf931112 Mon Sep 17 00:00:00 2001 From: Maria Haider Date: Wed, 20 Jun 2018 09:40:58 +0200 Subject: [PATCH 11/13] update db --- global/overlay/etc/puppet/cosmos-db.yaml | 102 ++++++++++++++--------- 1 file changed, 61 insertions(+), 41 deletions(-) diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml index c0d2486d..e177e38d 100644 --- a/global/overlay/etc/puppet/cosmos-db.yaml +++ b/global/overlay/etc/puppet/cosmos-db.yaml @@ -103,6 +103,17 @@ classes: redis_cluster_node: null sunet::rsyslog: null sunetops: null + eidas-redis-2.sveidas.se: + autoupdate: null + common: null + eid::dockerhost: null + entropyclient: null + infra_ca_rp: null + mailclient: *id002 + nrpe: null + redis_cluster_node: null + sunet::rsyslog: null + sunetops: null eidas-redis-3.sveidas.se: autoupdate: null common: null @@ -589,35 +600,38 @@ classes: members: all: [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-redis-1.sveidas.se, eidas-redis-3.sveidas.se, eidas-redis-fe-1.sveidas.se, - eidas-redis-fe-2.sveidas.se, fe-fre-3.komreg.net, fe-tug-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, + eidas-redis-1.sveidas.se, eidas-redis-2.sveidas.se, eidas-redis-3.sveidas.se, + eidas-redis-fe-1.sveidas.se, eidas-redis-fe-2.sveidas.se, fe-fre-3.komreg.net, + fe-tug-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, log.qa.sveidas.se, 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, prid-1.sveidas.se, prid-2.sveidas.se, r1.komreg.net, validator-1.qa.komreg.net, web-1.qa.sveidas.se] autoupdate: [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-redis-1.sveidas.se, eidas-redis-3.sveidas.se, eidas-redis-fe-1.sveidas.se, - eidas-redis-fe-2.sveidas.se, jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.komreg.net, - log.qa.sveidas.se, 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, prid-1.sveidas.se, - prid-2.sveidas.se, r1.komreg.net, validator-1.qa.komreg.net, web-1.qa.sveidas.se] + eidas-redis-1.sveidas.se, eidas-redis-2.sveidas.se, eidas-redis-3.sveidas.se, + eidas-redis-fe-1.sveidas.se, eidas-redis-fe-2.sveidas.se, jmp.komreg.net, jump-fre-3.komreg.net, + jump-tug-3.komreg.net, log.qa.sveidas.se, 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, + prid-1.sveidas.se, prid-2.sveidas.se, r1.komreg.net, validator-1.qa.komreg.net, + web-1.qa.sveidas.se] common: [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-redis-1.sveidas.se, eidas-redis-3.sveidas.se, eidas-redis-fe-1.sveidas.se, - eidas-redis-fe-2.sveidas.se, fe-fre-3.komreg.net, fe-tug-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, + eidas-redis-1.sveidas.se, eidas-redis-2.sveidas.se, eidas-redis-3.sveidas.se, + eidas-redis-fe-1.sveidas.se, eidas-redis-fe-2.sveidas.se, fe-fre-3.komreg.net, + fe-tug-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, log.qa.sveidas.se, 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, prid-1.sveidas.se, prid-2.sveidas.se, r1.komreg.net, validator-1.qa.komreg.net, web-1.qa.sveidas.se] eid::dockerhost: [eidas-connector-1.sveidas.se, eidas-connector-2.sveidas.se, eidas-connector-3.sveidas.se, - eidas-connector-4.sveidas.se, eidas-redis-1.sveidas.se, eidas-redis-3.sveidas.se, - eidas-redis-fe-1.sveidas.se, eidas-redis-fe-2.sveidas.se, fe-fre-3.komreg.net, - fe-tug-3.komreg.net, prid-1.sveidas.se, prid-2.sveidas.se] + eidas-connector-4.sveidas.se, eidas-redis-1.sveidas.se, eidas-redis-2.sveidas.se, + eidas-redis-3.sveidas.se, eidas-redis-fe-1.sveidas.se, eidas-redis-fe-2.sveidas.se, + fe-fre-3.komreg.net, fe-tug-3.komreg.net, prid-1.sveidas.se, prid-2.sveidas.se] 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, kvmmeta-fre-3.komreg.net] eidas_connector: [eidas-connector-1.sveidas.se, eidas-connector-2.sveidas.se, eidas-connector-3.sveidas.se, @@ -625,10 +639,11 @@ members: eidas_proxy: [eidas-proxy-1.qa.sveidas.se] entropyclient: [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-redis-1.sveidas.se, eidas-redis-3.sveidas.se, eidas-redis-fe-1.sveidas.se, - eidas-redis-fe-2.sveidas.se, fe-fre-3.komreg.net, fe-tug-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, + eidas-redis-1.sveidas.se, eidas-redis-2.sveidas.se, eidas-redis-3.sveidas.se, + eidas-redis-fe-1.sveidas.se, eidas-redis-fe-2.sveidas.se, fe-fre-3.komreg.net, + fe-tug-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, log.qa.sveidas.se, 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, prid-1.sveidas.se, prid-2.sveidas.se, @@ -636,10 +651,11 @@ members: github_client_credential: [web-1.qa.sveidas.se] infra_ca_rp: [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-redis-1.sveidas.se, eidas-redis-3.sveidas.se, eidas-redis-fe-1.sveidas.se, - eidas-redis-fe-2.sveidas.se, fe-fre-3.komreg.net, fe-tug-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, + eidas-redis-1.sveidas.se, eidas-redis-2.sveidas.se, eidas-redis-3.sveidas.se, + eidas-redis-fe-1.sveidas.se, eidas-redis-fe-2.sveidas.se, fe-fre-3.komreg.net, + fe-tug-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, log.qa.sveidas.se, 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, prid-1.sveidas.se, prid-2.sveidas.se, @@ -651,10 +667,11 @@ members: prid-2.sveidas.se, validator-1.qa.komreg.net] mailclient: [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-redis-1.sveidas.se, eidas-redis-3.sveidas.se, eidas-redis-fe-1.sveidas.se, - eidas-redis-fe-2.sveidas.se, fe-fre-3.komreg.net, fe-tug-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, + eidas-redis-1.sveidas.se, eidas-redis-2.sveidas.se, eidas-redis-3.sveidas.se, + eidas-redis-fe-1.sveidas.se, eidas-redis-fe-2.sveidas.se, fe-fre-3.komreg.net, + fe-tug-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, log.qa.sveidas.se, 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, prid-1.sveidas.se, prid-2.sveidas.se, @@ -666,10 +683,11 @@ members: nagios_monitor: [monitor-fre-3.komreg.net, nic.komreg.net] nrpe: [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-redis-1.sveidas.se, eidas-redis-3.sveidas.se, eidas-redis-fe-1.sveidas.se, - eidas-redis-fe-2.sveidas.se, fe-fre-3.komreg.net, fe-tug-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, + eidas-redis-1.sveidas.se, eidas-redis-2.sveidas.se, eidas-redis-3.sveidas.se, + eidas-redis-fe-1.sveidas.se, eidas-redis-fe-2.sveidas.se, fe-fre-3.komreg.net, + fe-tug-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, log.qa.sveidas.se, 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, prid-1.sveidas.se, prid-2.sveidas.se, @@ -679,7 +697,7 @@ members: validator-1.qa.komreg.net, 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] - redis_cluster_node: [eidas-redis-1.sveidas.se, eidas-redis-3.sveidas.se] + redis_cluster_node: [eidas-redis-1.sveidas.se, eidas-redis-2.sveidas.se, eidas-redis-3.sveidas.se] redis_frontend_node: [eidas-redis-fe-1.sveidas.se, eidas-redis-fe-2.sveidas.se] servicemonitor: [eidas-proxy-1.qa.sveidas.se, prid-1.qa.sveidas.se, prid-1.sveidas.se, prid-2.sveidas.se, validator-1.qa.komreg.net] @@ -692,10 +710,11 @@ members: web-1.qa.sveidas.se] sunet::rsyslog: [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-redis-1.sveidas.se, eidas-redis-3.sveidas.se, eidas-redis-fe-1.sveidas.se, - eidas-redis-fe-2.sveidas.se, fe-fre-3.komreg.net, fe-tug-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, + eidas-redis-1.sveidas.se, eidas-redis-2.sveidas.se, eidas-redis-3.sveidas.se, + eidas-redis-fe-1.sveidas.se, eidas-redis-fe-2.sveidas.se, fe-fre-3.komreg.net, + fe-tug-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, log.qa.sveidas.se, log.qa.sveidas.se, 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, prid-1.sveidas.se, @@ -706,10 +725,11 @@ members: web-1.qa.sveidas.se] sunetops: [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-redis-1.sveidas.se, eidas-redis-3.sveidas.se, eidas-redis-fe-1.sveidas.se, - eidas-redis-fe-2.sveidas.se, fe-fre-3.komreg.net, fe-tug-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, + eidas-redis-1.sveidas.se, eidas-redis-2.sveidas.se, eidas-redis-3.sveidas.se, + eidas-redis-fe-1.sveidas.se, eidas-redis-fe-2.sveidas.se, fe-fre-3.komreg.net, + fe-tug-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, log.qa.sveidas.se, 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, prid-1.sveidas.se, prid-2.sveidas.se, From b40450ba8ad40f01933d38c10b0bd84a45f28e76 Mon Sep 17 00:00:00 2001 From: Maria Haider Date: Wed, 20 Jun 2018 09:41:28 +0200 Subject: [PATCH 12/13] eidas-redis-4.sveidas.se added --- eidas-redis-4.sveidas.se/README | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 eidas-redis-4.sveidas.se/README diff --git a/eidas-redis-4.sveidas.se/README b/eidas-redis-4.sveidas.se/README new file mode 100644 index 00000000..a18dac1c --- /dev/null +++ b/eidas-redis-4.sveidas.se/README @@ -0,0 +1,3 @@ + +The system documentation is in the docs directory of the multiverse repository. + From 3ed7fef3ff2208b3b3d0d8839580a410c8410505 Mon Sep 17 00:00:00 2001 From: Maria Haider Date: Wed, 20 Jun 2018 09:44:16 +0200 Subject: [PATCH 13/13] update db --- global/overlay/etc/puppet/cosmos-db.yaml | 77 ++++++++++++++---------- 1 file changed, 45 insertions(+), 32 deletions(-) diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml index e177e38d..1758bef6 100644 --- a/global/overlay/etc/puppet/cosmos-db.yaml +++ b/global/overlay/etc/puppet/cosmos-db.yaml @@ -125,6 +125,17 @@ classes: redis_cluster_node: null sunet::rsyslog: null sunetops: null + eidas-redis-4.sveidas.se: + autoupdate: null + common: null + eid::dockerhost: null + entropyclient: null + infra_ca_rp: null + mailclient: *id002 + nrpe: null + redis_cluster_node: null + sunet::rsyslog: null + sunetops: null eidas-redis-fe-1.sveidas.se: autoupdate: null common: null @@ -601,9 +612,9 @@ members: all: [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-redis-1.sveidas.se, eidas-redis-2.sveidas.se, eidas-redis-3.sveidas.se, - eidas-redis-fe-1.sveidas.se, eidas-redis-fe-2.sveidas.se, fe-fre-3.komreg.net, - fe-tug-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, + eidas-redis-4.sveidas.se, eidas-redis-fe-1.sveidas.se, eidas-redis-fe-2.sveidas.se, + fe-fre-3.komreg.net, fe-tug-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, log.qa.sveidas.se, md-eu1.qa.komreg.net, md-fre-3.komreg.net, md1.komreg.net, monitor-fre-3.komreg.net, nic.komreg.net, @@ -612,17 +623,17 @@ members: autoupdate: [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-redis-1.sveidas.se, eidas-redis-2.sveidas.se, eidas-redis-3.sveidas.se, - eidas-redis-fe-1.sveidas.se, eidas-redis-fe-2.sveidas.se, jmp.komreg.net, jump-fre-3.komreg.net, - jump-tug-3.komreg.net, log.qa.sveidas.se, 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, - prid-1.sveidas.se, prid-2.sveidas.se, r1.komreg.net, validator-1.qa.komreg.net, - web-1.qa.sveidas.se] + eidas-redis-4.sveidas.se, eidas-redis-fe-1.sveidas.se, eidas-redis-fe-2.sveidas.se, + jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.komreg.net, log.qa.sveidas.se, + 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, prid-1.sveidas.se, prid-2.sveidas.se, + r1.komreg.net, validator-1.qa.komreg.net, web-1.qa.sveidas.se] common: [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-redis-1.sveidas.se, eidas-redis-2.sveidas.se, eidas-redis-3.sveidas.se, - eidas-redis-fe-1.sveidas.se, eidas-redis-fe-2.sveidas.se, fe-fre-3.komreg.net, - fe-tug-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, + eidas-redis-4.sveidas.se, eidas-redis-fe-1.sveidas.se, eidas-redis-fe-2.sveidas.se, + fe-fre-3.komreg.net, fe-tug-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, log.qa.sveidas.se, md-eu1.qa.komreg.net, md-fre-3.komreg.net, md1.komreg.net, monitor-fre-3.komreg.net, nic.komreg.net, @@ -630,8 +641,9 @@ members: r1.komreg.net, validator-1.qa.komreg.net, web-1.qa.sveidas.se] eid::dockerhost: [eidas-connector-1.sveidas.se, eidas-connector-2.sveidas.se, eidas-connector-3.sveidas.se, eidas-connector-4.sveidas.se, eidas-redis-1.sveidas.se, eidas-redis-2.sveidas.se, - eidas-redis-3.sveidas.se, eidas-redis-fe-1.sveidas.se, eidas-redis-fe-2.sveidas.se, - fe-fre-3.komreg.net, fe-tug-3.komreg.net, prid-1.sveidas.se, prid-2.sveidas.se] + eidas-redis-3.sveidas.se, eidas-redis-4.sveidas.se, eidas-redis-fe-1.sveidas.se, + eidas-redis-fe-2.sveidas.se, fe-fre-3.komreg.net, fe-tug-3.komreg.net, prid-1.sveidas.se, + prid-2.sveidas.se] 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, kvmmeta-fre-3.komreg.net] eidas_connector: [eidas-connector-1.sveidas.se, eidas-connector-2.sveidas.se, eidas-connector-3.sveidas.se, @@ -640,9 +652,9 @@ members: entropyclient: [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-redis-1.sveidas.se, eidas-redis-2.sveidas.se, eidas-redis-3.sveidas.se, - eidas-redis-fe-1.sveidas.se, eidas-redis-fe-2.sveidas.se, fe-fre-3.komreg.net, - fe-tug-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, + eidas-redis-4.sveidas.se, eidas-redis-fe-1.sveidas.se, eidas-redis-fe-2.sveidas.se, + fe-fre-3.komreg.net, fe-tug-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, log.qa.sveidas.se, md-eu1.qa.komreg.net, md-fre-3.komreg.net, md1.komreg.net, monitor-fre-3.komreg.net, nic.komreg.net, @@ -652,9 +664,9 @@ members: infra_ca_rp: [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-redis-1.sveidas.se, eidas-redis-2.sveidas.se, eidas-redis-3.sveidas.se, - eidas-redis-fe-1.sveidas.se, eidas-redis-fe-2.sveidas.se, fe-fre-3.komreg.net, - fe-tug-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, + eidas-redis-4.sveidas.se, eidas-redis-fe-1.sveidas.se, eidas-redis-fe-2.sveidas.se, + fe-fre-3.komreg.net, fe-tug-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, log.qa.sveidas.se, md-eu1.qa.komreg.net, md-fre-3.komreg.net, md1.komreg.net, monitor-fre-3.komreg.net, nic.komreg.net, @@ -668,9 +680,9 @@ members: mailclient: [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-redis-1.sveidas.se, eidas-redis-2.sveidas.se, eidas-redis-3.sveidas.se, - eidas-redis-fe-1.sveidas.se, eidas-redis-fe-2.sveidas.se, fe-fre-3.komreg.net, - fe-tug-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, + eidas-redis-4.sveidas.se, eidas-redis-fe-1.sveidas.se, eidas-redis-fe-2.sveidas.se, + fe-fre-3.komreg.net, fe-tug-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, log.qa.sveidas.se, md-eu1.qa.komreg.net, md-fre-3.komreg.net, md1.komreg.net, monitor-fre-3.komreg.net, nic.komreg.net, @@ -684,9 +696,9 @@ members: nrpe: [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-redis-1.sveidas.se, eidas-redis-2.sveidas.se, eidas-redis-3.sveidas.se, - eidas-redis-fe-1.sveidas.se, eidas-redis-fe-2.sveidas.se, fe-fre-3.komreg.net, - fe-tug-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, + eidas-redis-4.sveidas.se, eidas-redis-fe-1.sveidas.se, eidas-redis-fe-2.sveidas.se, + fe-fre-3.komreg.net, fe-tug-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, log.qa.sveidas.se, md-eu1.qa.komreg.net, md-fre-3.komreg.net, md1.komreg.net, monitor-fre-3.komreg.net, nic.komreg.net, @@ -697,7 +709,8 @@ members: validator-1.qa.komreg.net, 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] - redis_cluster_node: [eidas-redis-1.sveidas.se, eidas-redis-2.sveidas.se, eidas-redis-3.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] servicemonitor: [eidas-proxy-1.qa.sveidas.se, prid-1.qa.sveidas.se, prid-1.sveidas.se, prid-2.sveidas.se, validator-1.qa.komreg.net] @@ -711,9 +724,9 @@ members: sunet::rsyslog: [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-redis-1.sveidas.se, eidas-redis-2.sveidas.se, eidas-redis-3.sveidas.se, - eidas-redis-fe-1.sveidas.se, eidas-redis-fe-2.sveidas.se, fe-fre-3.komreg.net, - fe-tug-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, + eidas-redis-4.sveidas.se, eidas-redis-fe-1.sveidas.se, eidas-redis-fe-2.sveidas.se, + fe-fre-3.komreg.net, fe-tug-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, log.qa.sveidas.se, log.qa.sveidas.se, md-eu1.qa.komreg.net, md-fre-3.komreg.net, md1.komreg.net, monitor-fre-3.komreg.net, @@ -726,9 +739,9 @@ members: sunetops: [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-redis-1.sveidas.se, eidas-redis-2.sveidas.se, eidas-redis-3.sveidas.se, - eidas-redis-fe-1.sveidas.se, eidas-redis-fe-2.sveidas.se, fe-fre-3.komreg.net, - fe-tug-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, + eidas-redis-4.sveidas.se, eidas-redis-fe-1.sveidas.se, eidas-redis-fe-2.sveidas.se, + fe-fre-3.komreg.net, fe-tug-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, log.qa.sveidas.se, md-eu1.qa.komreg.net, md-fre-3.komreg.net, md1.komreg.net, monitor-fre-3.komreg.net, nic.komreg.net,