rename ch-pan to ch-pan-legacy and some other cleanups

6 files changed, 20 insertions, 6 deletions

diff --git a/inventory/group_vars/vmhost-ch-atlas/vars.yml b/inventory/group_vars/vmhost-ch-atlas/vars.yml
index f6e83cdf..b6f7c46f 100644
--- a/inventory/group_vars/vmhost-ch-atlas/vars.yml
+++ b/inventory/group_vars/vmhost-ch-atlas/vars.yml
@@ -14,10 +14,21 @@ vm_host:
         prefix6: 2a02:3e0:407::/64
         gateway6: 2a02:3e0:407::1
         offsets:
+          ch-pan-legacy: 1
+          s2-build: 2
+          ch-pan: 3
           ch-testvm-atlas: 4
           ele-mur: 5
           r3-vex2: 11
           ch-atlas: 13
+        offsets6:
+          ch-pan-legacy: 23
+          s2-build: 24
+          ch-pan: 25
+          ch-testvm-atlas: 32
+          ele-mur: 33
+          r3-vex2: 39
+          ch-atlas: 41
       k8stest: {}
       funkfeuer:
         interfaces:
diff --git a/inventory/host_vars/ch-atlas.yml b/inventory/host_vars/ch-atlas.yml
index 7bf990c9..acc092f6 100644
--- a/inventory/host_vars/ch-atlas.yml
+++ b/inventory/host_vars/ch-atlas.yml
@@ -16,8 +16,7 @@ network:
     name: br-public
     address: "{{ vm_host.network.bridges.public.prefix | ansible.utils.ipaddr(vm_host.network.bridges.public.offsets[inventory_hostname]) }}"
     gateway: "{{ vm_host.network.bridges.public.gateway }}"
-#    address6: "{{ vm_host.network.bridges.public.prefix6 | ansible.utils.ipaddr(vm_host.network.bridges.public.offsets6[inventory_hostname]) }}"
-    address6: "{{ vm_host.network.bridges.public.prefix6 | ansible.utils.ipaddr(41) }}"
+    address6: "{{ vm_host.network.bridges.public.prefix6 | ansible.utils.ipaddr(vm_host.network.bridges.public.offsets6[inventory_hostname]) }}"
     gateway6: "{{ vm_host.network.bridges.public.gateway6 }}"
   interfaces:
   - *_network_primary_
diff --git a/inventory/host_vars/ch-pan.yml b/inventory/host_vars/ch-pan-legacy.yml
index 560cf90b..560cf90b 100644
--- a/inventory/host_vars/ch-pan.yml
+++ b/inventory/host_vars/ch-pan-legacy.yml
diff --git a/inventory/host_vars/ch-testvm-atlas.yml b/inventory/host_vars/ch-testvm-atlas.yml
index 3f10a59e..b1a21b37 100644
--- a/inventory/host_vars/ch-testvm-atlas.yml
+++ b/inventory/host_vars/ch-testvm-atlas.yml
@@ -27,7 +27,7 @@ network:
     name: primary0
     address: "{{ vm_host.network.bridges.public.prefix | ansible.utils.ipaddr(vm_host.network.bridges.public.offsets[inventory_hostname]) }}"
     gateway: "{{ vm_host.network.bridges.public.gateway }}"
-    address6: "{{ vm_host.network.bridges.public.prefix6 | ansible.utils.ipaddr(vm_host.network.bridges.public.offsets[inventory_hostname]) }}"
+    address6: "{{ vm_host.network.bridges.public.prefix6 | ansible.utils.ipaddr(vm_host.network.bridges.public.offsets6[inventory_hostname]) }}"
     gateway6: "{{ vm_host.network.bridges.public.gateway6 }}"
   interfaces:
   - *_network_primary_
diff --git a/inventory/host_vars/r3-vex2.yml b/inventory/host_vars/r3-vex2.yml
index 48ea0e7a..9e07faee 100644
--- a/inventory/host_vars/r3-vex2.yml
+++ b/inventory/host_vars/r3-vex2.yml
@@ -25,7 +25,7 @@ network:
     name: primary0
     address: "{{ vm_host.network.bridges.public.prefix | ansible.utils.ipaddr(vm_host.network.bridges.public.offsets[inventory_hostname]) }}"
     gateway: "{{ vm_host.network.bridges.public.gateway }}"
-    address6: "{{ vm_host.network.bridges.public.prefix6 | ansible.utils.ipaddr(vm_host.network.bridges.public.offsets[inventory_hostname]) }}"
+    address6: "{{ vm_host.network.bridges.public.prefix6 | ansible.utils.ipaddr(vm_host.network.bridges.public.offsets6[inventory_hostname]) }}"
     gateway6: "{{ vm_host.network.bridges.public.gateway6 }}"
   interfaces:
   - *_network_primary_
diff --git a/inventory/hosts.ini b/inventory/hosts.ini
index a9eb2b46..b4c933ed 100644
--- a/inventory/hosts.ini
+++ b/inventory/hosts.ini
@@ -39,6 +39,7 @@ ch-epimetheus host_name=epimetheus
 ch-mclr host_name=mclr
 ch-mcbr host_name=mcbr
 ch-atlas host_name=atlas
+ch-pan-legacy host_name=pan
 ch-pan host_name=pan
 ch-testvm-atlas host_name=testvm-atlas
 ch-mimas-legacy host_name=mimas
@@ -89,7 +90,7 @@ ch-ups-test host_name=ups-test
 
 [chaos-at-home-vpn-extern]
 ch-router
-ch-pan
+ch-pan-legacy
 
 
 [realraum:vars]
@@ -310,7 +311,7 @@ python_basename=python
 
 [python2]
 ch-prometheus-legacy
-ch-pan
+ch-pan-legacy
 ch-mimas-legacy
 s2-build
 sk-2019
@@ -353,6 +354,9 @@ ch-prometheus
 vmhost-ch-prometheus-guests
 
 [vmhost-ch-atlas-guests]
+ch-pan-legacy
+s2-build
+ch-pan
 ch-testvm-atlas
 ele-mur
 r3-vex2