Merge branch 'master' of gitops.sunet.se:eid-ops

fe-common/overlay/etc/hiera/data/group.yaml

@@ -156,7 +156,7 @@ sunet_frontend:
               ips: ['94.176.224.252']
               server_args: 'ssl check verify none'
             'demw-2.sveidas.se':
-              ips: ['94.176.224.253']
+              ips: ['94.176.224.125']
               server_args: 'ssl check verify none'
         allow_ports:
           - 443

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

@@ -498,8 +498,8 @@ classes:
     eid::kvmhost:
       vms:
         demw-2.sveidas.se: {bridge: br-demw, cpus: '16', description: eid deutsche
-            middleware, gateway: 94.176.224.249, image_url: 'https://cloud-images.ubuntu.com/bionic/current/bionic-server-cloudimg-amd64.img',
-          ip: 94.176.224.253, mac: '52:54:20:01:05:02', memory: '32768', netmask: 255.255.255.248}
+            middleware, gateway: 94.176.224.121, image_url: 'https://cloud-images.ubuntu.com/bionic/current/bionic-server-cloudimg-amd64.img',
+          ip: 94.176.224.125, mac: '52:54:20:01:05:02', memory: '32768', netmask: 255.255.255.248}
     entropyclient: null
     infra_ca_rp: null
     mailclient: *id001

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

@@ -388,9 +388,9 @@ kvmdemw-fre-3b.komreg.net:
       vms:
          demw-2.sveidas.se:
             mac: '52:54:20:01:05:02'
-            ip: '94.176.224.253'
+            ip: '94.176.224.125'
             netmask: '255.255.255.248'
-            gateway: '94.176.224.249'
+            gateway: '94.176.224.121'
             bridge: 'br-demw'
             description: 'eid deutsche middleware'
             cpus: '16'

kvmdemw-fre-3b.komreg.net/overlay/etc/netplan/01-netcfg.yaml

@@ -21,8 +21,8 @@ network:
     br-demw:
       interfaces: [eno1.105]
       addresses:
-      - 94.176.224.251/29
+      - 94.176.224.123/29
       nameservers:
         addresses:
         - 89.32.32.32
-      gateway4: 94.176.224.249
+      gateway4: 94.176.224.121