Merge branch 'master' of git.nordu.net:eid-ops

eidas-redis-2.sveidas.se/README

@@ -0,0 +1,3 @@
+
+The system documentation is in the docs directory of the multiverse repository.
+

eidas-redis-3.sveidas.se/README

@@ -0,0 +1,3 @@
+
+The system documentation is in the docs directory of the multiverse repository.
+

eidas-redis-4.sveidas.se/README

@@ -0,0 +1,3 @@
+
+The system documentation is in the docs directory of the multiverse repository.
+

eidas-redis-fe-2.sveidas.se/README

@@ -0,0 +1,3 @@
+
+The system documentation is in the docs directory of the multiverse repository.
+

global/overlay/etc/hiera/data/common.yaml

@@ -58,5 +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

global/overlay/etc/puppet/cosmos-db.yaml

@@ -103,6 +103,39 @@ 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
+    eid::dockerhost: null
+    entropyclient: null
+    infra_ca_rp: null
+    mailclient: *id002
+    nrpe: null
+    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
@@ -111,7 +144,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:
@@ -200,6 +244,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 +304,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'
@@ -457,7 +541,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
@@ -470,7 +554,7 @@ classes:
     konsulter: null
     mailclient: *id002
     nrpe: null
-    prid: *id004
+    prid: *id005
     servicemonitor: null
     sunet::rsyslog: null
     sunetops: null
@@ -527,34 +611,39 @@ 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,
+    eidas-redis-1.sveidas.se, eidas-redis-2.sveidas.se, eidas-redis-3.sveidas.se,
-    jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.komreg.net, kvmeidas-fre-3.komreg.net,
+    eidas-redis-4.sveidas.se, eidas-redis-fe-1.sveidas.se, eidas-redis-fe-2.sveidas.se,
-    kvmeidas-tug-3.komreg.net, kvmfe-fre-3.komreg.net, kvmfe-tug-3.komreg.net, kvminfra-fre-3.komreg.net,
+    fe-fre-3.komreg.net, fe-tug-3.komreg.net, jmp.komreg.net, jump-fre-3.komreg.net,
-    kvminfra-tug-3.komreg.net, kvmmeta-fre-3.komreg.net, kvmmeta-tug-3.komreg.net,
+    jump-tug-3.komreg.net, kvmeidas-fre-3.komreg.net, kvmeidas-tug-3.komreg.net, kvmfe-fre-3.komreg.net,
-    log.qa.sveidas.se, md-eu1.qa.komreg.net, md-fre-3.komreg.net, md1.komreg.net,
+    kvmfe-tug-3.komreg.net, kvminfra-fre-3.komreg.net, kvminfra-tug-3.komreg.net,
-    monitor-fre-3.komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.komreg.net, prid-1.qa.sveidas.se,
+    kvmmeta-fre-3.komreg.net, kvmmeta-tug-3.komreg.net, log.qa.sveidas.se, md-eu1.qa.komreg.net,
-    prid-1.sveidas.se, prid-2.sveidas.se, r1.komreg.net, validator-1.qa.komreg.net,
+    md-fre-3.komreg.net, md1.komreg.net, monitor-fre-3.komreg.net, nic.komreg.net,
-    web-1.qa.sveidas.se]
+    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,
+    eidas-redis-1.sveidas.se, eidas-redis-2.sveidas.se, eidas-redis-3.sveidas.se,
-    jump-tug-3.komreg.net, log.qa.sveidas.se, md-eu1.qa.komreg.net, md-fre-3.komreg.net,
+    eidas-redis-4.sveidas.se, eidas-redis-fe-1.sveidas.se, eidas-redis-fe-2.sveidas.se,
-    monitor-fre-3.komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.komreg.net, prid-1.qa.sveidas.se,
+    jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.komreg.net, log.qa.sveidas.se,
-    prid-1.sveidas.se, prid-2.sveidas.se, r1.komreg.net, validator-1.qa.komreg.net,
+    md-eu1.qa.komreg.net, md-fre-3.komreg.net, monitor-fre-3.komreg.net, nic.komreg.net,
-    web-1.qa.sveidas.se]
+    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,
+    eidas-redis-1.sveidas.se, eidas-redis-2.sveidas.se, eidas-redis-3.sveidas.se,
-    jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.komreg.net, kvmeidas-fre-3.komreg.net,
+    eidas-redis-4.sveidas.se, eidas-redis-fe-1.sveidas.se, eidas-redis-fe-2.sveidas.se,
-    kvmeidas-tug-3.komreg.net, kvmfe-fre-3.komreg.net, kvmfe-tug-3.komreg.net, kvminfra-fre-3.komreg.net,
+    fe-fre-3.komreg.net, fe-tug-3.komreg.net, jmp.komreg.net, jump-fre-3.komreg.net,
-    kvminfra-tug-3.komreg.net, kvmmeta-fre-3.komreg.net, kvmmeta-tug-3.komreg.net,
+    jump-tug-3.komreg.net, kvmeidas-fre-3.komreg.net, kvmeidas-tug-3.komreg.net, kvmfe-fre-3.komreg.net,
-    log.qa.sveidas.se, md-eu1.qa.komreg.net, md-fre-3.komreg.net, md1.komreg.net,
+    kvmfe-tug-3.komreg.net, kvminfra-fre-3.komreg.net, kvminfra-tug-3.komreg.net,
-    monitor-fre-3.komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.komreg.net, prid-1.qa.sveidas.se,
+    kvmmeta-fre-3.komreg.net, kvmmeta-tug-3.komreg.net, log.qa.sveidas.se, md-eu1.qa.komreg.net,
-    prid-1.sveidas.se, prid-2.sveidas.se, r1.komreg.net, validator-1.qa.komreg.net,
+    md-fre-3.komreg.net, md1.komreg.net, monitor-fre-3.komreg.net, nic.komreg.net,
-    web-1.qa.sveidas.se]
+    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,
+    eidas-connector-4.sveidas.se, eidas-redis-1.sveidas.se, eidas-redis-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,
@@ -562,25 +651,27 @@ 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,
+    eidas-redis-1.sveidas.se, eidas-redis-2.sveidas.se, eidas-redis-3.sveidas.se,
-    jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.komreg.net, kvmeidas-fre-3.komreg.net,
+    eidas-redis-4.sveidas.se, eidas-redis-fe-1.sveidas.se, eidas-redis-fe-2.sveidas.se,
-    kvmeidas-tug-3.komreg.net, kvmfe-fre-3.komreg.net, kvmfe-tug-3.komreg.net, kvminfra-fre-3.komreg.net,
+    fe-fre-3.komreg.net, fe-tug-3.komreg.net, jmp.komreg.net, jump-fre-3.komreg.net,
-    kvminfra-tug-3.komreg.net, kvmmeta-fre-3.komreg.net, kvmmeta-tug-3.komreg.net,
+    jump-tug-3.komreg.net, kvmeidas-fre-3.komreg.net, kvmeidas-tug-3.komreg.net, kvmfe-fre-3.komreg.net,
-    log.qa.sveidas.se, md-eu1.qa.komreg.net, md-fre-3.komreg.net, md1.komreg.net,
+    kvmfe-tug-3.komreg.net, kvminfra-fre-3.komreg.net, kvminfra-tug-3.komreg.net,
-    monitor-fre-3.komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.komreg.net, prid-1.qa.sveidas.se,
+    kvmmeta-fre-3.komreg.net, kvmmeta-tug-3.komreg.net, log.qa.sveidas.se, md-eu1.qa.komreg.net,
-    prid-1.sveidas.se, prid-2.sveidas.se, r1.komreg.net, validator-1.qa.komreg.net,
+    md-fre-3.komreg.net, md1.komreg.net, monitor-fre-3.komreg.net, nic.komreg.net,
-    web-1.qa.sveidas.se]
+    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,
+    eidas-redis-1.sveidas.se, eidas-redis-2.sveidas.se, eidas-redis-3.sveidas.se,
-    jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.komreg.net, kvmeidas-fre-3.komreg.net,
+    eidas-redis-4.sveidas.se, eidas-redis-fe-1.sveidas.se, eidas-redis-fe-2.sveidas.se,
-    kvmeidas-tug-3.komreg.net, kvmfe-fre-3.komreg.net, kvmfe-tug-3.komreg.net, kvminfra-fre-3.komreg.net,
+    fe-fre-3.komreg.net, fe-tug-3.komreg.net, jmp.komreg.net, jump-fre-3.komreg.net,
-    kvminfra-tug-3.komreg.net, kvmmeta-fre-3.komreg.net, kvmmeta-tug-3.komreg.net,
+    jump-tug-3.komreg.net, kvmeidas-fre-3.komreg.net, kvmeidas-tug-3.komreg.net, kvmfe-fre-3.komreg.net,
-    log.qa.sveidas.se, md-eu1.qa.komreg.net, md-fre-3.komreg.net, md1.komreg.net,
+    kvmfe-tug-3.komreg.net, kvminfra-fre-3.komreg.net, kvminfra-tug-3.komreg.net,
-    monitor-fre-3.komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.komreg.net, prid-1.qa.sveidas.se,
+    kvmmeta-fre-3.komreg.net, kvmmeta-tug-3.komreg.net, log.qa.sveidas.se, md-eu1.qa.komreg.net,
-    prid-1.sveidas.se, prid-2.sveidas.se, r1.komreg.net, validator-1.qa.komreg.net,
+    md-fre-3.komreg.net, md1.komreg.net, monitor-fre-3.komreg.net, nic.komreg.net,
-    web-1.qa.sveidas.se]
+    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,
@@ -588,14 +679,15 @@ 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,
+    eidas-redis-1.sveidas.se, eidas-redis-2.sveidas.se, eidas-redis-3.sveidas.se,
-    jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.komreg.net, kvmeidas-fre-3.komreg.net,
+    eidas-redis-4.sveidas.se, eidas-redis-fe-1.sveidas.se, eidas-redis-fe-2.sveidas.se,
-    kvmeidas-tug-3.komreg.net, kvmfe-fre-3.komreg.net, kvmfe-tug-3.komreg.net, kvminfra-fre-3.komreg.net,
+    fe-fre-3.komreg.net, fe-tug-3.komreg.net, jmp.komreg.net, jump-fre-3.komreg.net,
-    kvminfra-tug-3.komreg.net, kvmmeta-fre-3.komreg.net, kvmmeta-tug-3.komreg.net,
+    jump-tug-3.komreg.net, kvmeidas-fre-3.komreg.net, kvmeidas-tug-3.komreg.net, kvmfe-fre-3.komreg.net,
-    log.qa.sveidas.se, md-eu1.qa.komreg.net, md-fre-3.komreg.net, md1.komreg.net,
+    kvmfe-tug-3.komreg.net, kvminfra-fre-3.komreg.net, kvminfra-tug-3.komreg.net,
-    monitor-fre-3.komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.komreg.net, prid-1.qa.sveidas.se,
+    kvmmeta-fre-3.komreg.net, kvmmeta-tug-3.komreg.net, log.qa.sveidas.se, md-eu1.qa.komreg.net,
-    prid-1.sveidas.se, prid-2.sveidas.se, r1.komreg.net, validator-1.qa.komreg.net,
+    md-fre-3.komreg.net, md1.komreg.net, monitor-fre-3.komreg.net, nic.komreg.net,
-    web-1.qa.sveidas.se]
+    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]
@@ -603,21 +695,23 @@ 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,
+    eidas-redis-1.sveidas.se, eidas-redis-2.sveidas.se, eidas-redis-3.sveidas.se,
-    jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.komreg.net, kvmeidas-fre-3.komreg.net,
+    eidas-redis-4.sveidas.se, eidas-redis-fe-1.sveidas.se, eidas-redis-fe-2.sveidas.se,
-    kvmeidas-tug-3.komreg.net, kvmfe-fre-3.komreg.net, kvmfe-tug-3.komreg.net, kvminfra-fre-3.komreg.net,
+    fe-fre-3.komreg.net, fe-tug-3.komreg.net, jmp.komreg.net, jump-fre-3.komreg.net,
-    kvminfra-tug-3.komreg.net, kvmmeta-fre-3.komreg.net, kvmmeta-tug-3.komreg.net,
+    jump-tug-3.komreg.net, kvmeidas-fre-3.komreg.net, kvmeidas-tug-3.komreg.net, kvmfe-fre-3.komreg.net,
-    log.qa.sveidas.se, md-eu1.qa.komreg.net, md-fre-3.komreg.net, md1.komreg.net,
+    kvmfe-tug-3.komreg.net, kvminfra-fre-3.komreg.net, kvminfra-tug-3.komreg.net,
-    monitor-fre-3.komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.komreg.net, prid-1.qa.sveidas.se,
+    kvmmeta-fre-3.komreg.net, kvmmeta-tug-3.komreg.net, log.qa.sveidas.se, md-eu1.qa.komreg.net,
-    prid-1.sveidas.se, prid-2.sveidas.se, r1.komreg.net, validator-1.qa.komreg.net,
+    md-fre-3.komreg.net, md1.komreg.net, monitor-fre-3.komreg.net, nic.komreg.net,
-    web-1.qa.sveidas.se]
+    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-2.sveidas.se, eidas-redis-3.sveidas.se,
-  redis_frontend_node: [eidas-redis-fe-1.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]
   sunet::auditd: [jmp.komreg.net]
@@ -629,27 +723,29 @@ 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,
+    eidas-redis-1.sveidas.se, eidas-redis-2.sveidas.se, eidas-redis-3.sveidas.se,
-    jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.komreg.net, kvmeidas-fre-3.komreg.net,
+    eidas-redis-4.sveidas.se, eidas-redis-fe-1.sveidas.se, eidas-redis-fe-2.sveidas.se,
-    kvmeidas-tug-3.komreg.net, kvmfe-fre-3.komreg.net, kvmfe-tug-3.komreg.net, kvminfra-fre-3.komreg.net,
+    fe-fre-3.komreg.net, fe-tug-3.komreg.net, jmp.komreg.net, jump-fre-3.komreg.net,
-    kvminfra-tug-3.komreg.net, kvmmeta-fre-3.komreg.net, kvmmeta-tug-3.komreg.net,
+    jump-tug-3.komreg.net, kvmeidas-fre-3.komreg.net, kvmeidas-tug-3.komreg.net, kvmfe-fre-3.komreg.net,
-    log.qa.sveidas.se, log.qa.sveidas.se, md-eu1.qa.komreg.net, md-fre-3.komreg.net,
+    kvmfe-tug-3.komreg.net, kvminfra-fre-3.komreg.net, kvminfra-tug-3.komreg.net,
-    md1.komreg.net, monitor-fre-3.komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.komreg.net,
+    kvmmeta-fre-3.komreg.net, kvmmeta-tug-3.komreg.net, log.qa.sveidas.se, log.qa.sveidas.se,
-    prid-1.qa.sveidas.se, prid-1.sveidas.se, prid-2.sveidas.se, r1.komreg.net, validator-1.qa.komreg.net,
+    md-eu1.qa.komreg.net, md-fre-3.komreg.net, md1.komreg.net, monitor-fre-3.komreg.net,
-    web-1.qa.sveidas.se]
+    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,
+    eidas-redis-1.sveidas.se, eidas-redis-2.sveidas.se, eidas-redis-3.sveidas.se,
-    jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.komreg.net, kvmeidas-fre-3.komreg.net,
+    eidas-redis-4.sveidas.se, eidas-redis-fe-1.sveidas.se, eidas-redis-fe-2.sveidas.se,
-    kvmeidas-tug-3.komreg.net, kvmfe-fre-3.komreg.net, kvmfe-tug-3.komreg.net, kvminfra-fre-3.komreg.net,
+    fe-fre-3.komreg.net, fe-tug-3.komreg.net, jmp.komreg.net, jump-fre-3.komreg.net,
-    kvminfra-tug-3.komreg.net, kvmmeta-fre-3.komreg.net, kvmmeta-tug-3.komreg.net,
+    jump-tug-3.komreg.net, kvmeidas-fre-3.komreg.net, kvmeidas-tug-3.komreg.net, kvmfe-fre-3.komreg.net,
-    log.qa.sveidas.se, md-eu1.qa.komreg.net, md-fre-3.komreg.net, md1.komreg.net,
+    kvmfe-tug-3.komreg.net, kvminfra-fre-3.komreg.net, kvminfra-tug-3.komreg.net,
-    monitor-fre-3.komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.komreg.net, prid-1.qa.sveidas.se,
+    kvmmeta-fre-3.komreg.net, kvmmeta-tug-3.komreg.net, log.qa.sveidas.se, md-eu1.qa.komreg.net,
-    prid-1.sveidas.se, prid-2.sveidas.se, r1.komreg.net, validator-1.qa.komreg.net,
+    md-fre-3.komreg.net, md1.komreg.net, monitor-fre-3.komreg.net, nic.komreg.net,
-    web-1.qa.sveidas.se]
+    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]
 

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'