prepare install config and playbooks for ele-(helene,dione,telesto)

3 files changed, 14 insertions, 22 deletions

diff --git a/inventory/group_vars/elevate-festival/vars.yml b/inventory/group_vars/elevate-festival/vars.yml
index 6329deb9..9391f80c 100644
--- a/inventory/group_vars/elevate-festival/vars.yml
+++ b/inventory/group_vars/elevate-festival/vars.yml
@@ -12,9 +12,10 @@ network_zones:
       limit: 199
     offsets:
       ele-media: 200
-      ele-telesto: 201
+      ele-helene: 201
       ele-thetys: 202
       ele-calypso: 203
+      ele-dione: 204
       ele-tsdatacop: 210
       ele-hpws-maxi: 211
       ele-mon: 220
@@ -62,7 +63,7 @@ network_zones:
       ele-hpws-mini1: 241
       ele-minidan: 242
       equinox-t450s: 250
-      ele-helene: 253
+      ele-dione: 253
       ele-router: 254
     wifi:
       ssid: "elevate Public"
@@ -229,7 +230,7 @@ network_zones:
     - 217.29.144.66
     offsets:
       ## citycom uses offset 1,2 and 3
-      ele-helene: 4  # 85.237.28.196
+      ele-telesto: 4  # 85.237.28.196
       ele-dione: 5   # 85.237.28.197
       ele-laptop: 7   # 85.237.28.199
 
@@ -264,6 +265,7 @@ network_zones:
     offsets:
       ## citycom uses offset 1,2 and 3
       ele-router-leslie: 5 #4  # x.x.x.x+4
+      ele-thetys: 6 #5         # x.x.x.x+5
 
   cc_hmtsaal:
     description: "citycom upstream @ Heimatsaal (Fiber)"
@@ -277,6 +279,7 @@ network_zones:
     offsets:
       ## citycom uses offset 1,2 and 3
       ele-router-hmtsaal: 4  # x.x.x.x+4
+      ele-telesto: 5         # x.x.x.x+5
 
   funkfeuer:
     description: "funkfeuer access, subnet will be announced by olsr using HNA"
@@ -295,8 +298,8 @@ network_zones:
     description: "transfer network for upstream via mur.at"
     prefix: 172.31.255.240/28
     offsets:
-      ele-dione: 1
-      ele-helene: 2
+      ele-telesto: 1
+      ele-dione: 2
       equinox-t450s: 10
       ele-mon: 11
       ele-router: 13
diff --git a/inventory/group_vars/k8s-emc/vars.yml b/inventory/group_vars/k8s-emc/vars.yml
index be1c4818..14b5cd84 100644
--- a/inventory/group_vars/k8s-emc/vars.yml
+++ b/inventory/group_vars/k8s-emc/vars.yml
@@ -35,16 +35,16 @@ kubeguard:
     emc-06: 6
     emc-00: 100
     emc-dist0: 110
-    ele-dione: 111
-    ele-helene: 112
+    ele-telesto: 111
+    ele-dione: 112
     emc-ctrl: 127
 
   direct_net_zones:
     encoder:
       transfer_net: 172.18.191.0/24
       node_interface:
+        ele-telesto: eno2
         ele-dione: eno2
-        ele-helene: eno2
 
 kubernetes_overlay_node_ip: "{{ kubernetes.pod_ip_range | ipsubnet(kubernetes.pod_ip_range_size, kubeguard.node_index[inventory_hostname]) | ipaddr(1) | ipaddr('address') }}"
 
diff --git a/inventory/group_vars/vmhost-ele-telesto/vars.yml b/inventory/group_vars/vmhost-ele-helene/vars.yml
index 688fa66f..45f6ca62 100644
--- a/inventory/group_vars/vmhost-ele-telesto/vars.yml
+++ b/inventory/group_vars/vmhost-ele-helene/vars.yml
@@ -1,6 +1,6 @@
 ---
 __vmhost_bridge_interface_zones__:
-  eno1: "{{ network_zones | dict2items | rejectattr('value.vlan', 'undefined') | map(attribute='key') | difference(['lan']) }}"
+  eno2: "{{ network_zones | dict2items | rejectattr('value.vlan', 'undefined') | map(attribute='key') | difference(['lan']) }}"
 
 __vmhost_bridge_interface_zones_yaml__: |
   {% for interface in (__vmhost_bridge_interface_zones__.keys() | sort) %}
@@ -12,20 +12,9 @@ __vmhost_bridge_interface_zones_yaml__: |
   {% endfor %}
   lan:
     interfaces:
-    - enp3s0
+    - eno1
 
 vm_host:
-  name: ele-telesto
+  name: ele-helene
   network:
     bridges: "{{ __vmhost_bridge_interface_zones_yaml__ | from_yaml }}"
-  zfs:
-    default:
-      pool: ssd
-      name: vm
-      properties:
-        compression: lz4
-    storage:
-      pool: storage
-      name: vm
-      properties:
-        compression: lz4