converted other physical machines to new network config

12 files changed, 59 insertions, 47 deletions

diff --git a/inventory/host_vars/ch-equinox-ws.yml b/inventory/host_vars/ch-equinox-ws.yml
index fb1da511..6d454f57 100644
--- a/inventory/host_vars/ch-equinox-ws.yml
+++ b/inventory/host_vars/ch-equinox-ws.yml
@@ -11,7 +11,7 @@ network:
   domain: "{{ host_domain }}"
   primary: &_network_primary_
     name: enp8s0
-    prefix: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets[inventory_hostname]) | ipaddr('address/prefix') }}"
+    address: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets[inventory_hostname]) | ipaddr('address/prefix') }}"
     gateway: "{{ network_zones.lan.gateway }}"
   interfaces:
   - *_network_primary_
diff --git a/inventory/host_vars/ele-calypso.yml b/inventory/host_vars/ele-calypso.yml
index 7ffdd701..865bcebb 100644
--- a/inventory/host_vars/ele-calypso.yml
+++ b/inventory/host_vars/ele-calypso.yml
@@ -6,8 +6,9 @@ install: {}
 network:
   nameservers: "{{ network_zones.lan.dns }}"
   domain: "{{ host_domain }}"
-  primary:
-    interface: eno1
-    ip: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets[inventory_hostname]) | ipaddr('address') }}"
-    mask: "{{ network_zones.lan.prefix | ipaddr('netmask') }}"
+  primary: &_network_primary_
+    name: eno1
+    address: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets[inventory_hostname]) | ipaddr('address/prefix') }}"
     gateway: "{{ network_zones.lan.gateway }}"
+  interfaces:
+  - *_network_primary_
diff --git a/inventory/host_vars/ele-dione.yml b/inventory/host_vars/ele-dione.yml
index 368ac94a..233fc9e8 100644
--- a/inventory/host_vars/ele-dione.yml
+++ b/inventory/host_vars/ele-dione.yml
@@ -10,11 +10,12 @@ install:
 network:
   nameservers: "{{ network_zones.lan.dns }}"
   domain: spreadspace.org
-  primary:
-    interface: eno1
-    ip: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets[inventory_hostname]) | ipaddr('address') }}"
-    mask: "{{ network_zones.lan.prefix | ipaddr('netmask') }}"
+  primary: &_network_primary_
+    name: eno1
+    address: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets[inventory_hostname]) | ipaddr('address/prefix') }}"
     gateway: "{{ network_zones.lan.gateway }}"
+  interfaces:
+  - *_network_primary_
 
 base_packages_extra_host:
   - exfat-fuse
diff --git a/inventory/host_vars/ele-helene.yml b/inventory/host_vars/ele-helene.yml
index b5b74ff2..a28eccf2 100644
--- a/inventory/host_vars/ele-helene.yml
+++ b/inventory/host_vars/ele-helene.yml
@@ -10,11 +10,12 @@ install:
 network:
   nameservers: "{{ network_zones.lan.dns }}"
   domain: spreadspace.org
-  primary:
-    interface: eno1
-    ip: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets[inventory_hostname]) | ipaddr('address') }}"
-    mask: "{{ network_zones.lan.prefix | ipaddr('netmask') }}"
+  primary: &_network_primary_
+    name: eno1
+    address: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets[inventory_hostname]) | ipaddr('address/prefix') }}"
     gateway: "{{ network_zones.lan.gateway }}"
+  interfaces:
+  - *_network_primary_
 
 base_packages_extra_host:
   - exfat-fuse
diff --git a/inventory/host_vars/ele-media.yml b/inventory/host_vars/ele-media.yml
index bf638639..b61ef79e 100644
--- a/inventory/host_vars/ele-media.yml
+++ b/inventory/host_vars/ele-media.yml
@@ -6,11 +6,12 @@ install:
 network:
   nameservers: "{{ network_zones.lan.dns }}"
   domain: "{{ host_domain }}"
-  primary:
-    interface: eno1
-    ip: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets[inventory_hostname]) | ipaddr('address') }}"
-    mask: "{{ network_zones.lan.prefix | ipaddr('netmask') }}"
+  primary: &_network_primary_
+    name: eno1
+    address: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets[inventory_hostname]) | ipaddr('address/prefix') }}"
     gateway: "{{ network_zones.lan.gateway }}"
+  interfaces:
+  - *_network_primary_
 
 network_setup: elevate-festival
 
diff --git a/inventory/host_vars/ele-telesto.yml b/inventory/host_vars/ele-telesto.yml
index 7ac794a5..a8b2b162 100644
--- a/inventory/host_vars/ele-telesto.yml
+++ b/inventory/host_vars/ele-telesto.yml
@@ -8,11 +8,12 @@ install: {}
 network:
   nameservers: "{{ network_zones.lan.dns }}"
   domain: "{{ host_domain }}"
-  primary:
-    interface: eno1
-    ip: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets[inventory_hostname]) | ipaddr('address') }}"
-    mask: "{{ network_zones.lan.prefix | ipaddr('netmask') }}"
+  primary: &_network_primary_
+    name: eno1
+    address: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets[inventory_hostname]) | ipaddr('address/prefix') }}"
     gateway: "{{ network_zones.lan.gateway }}"
+  interfaces:
+  - *_network_primary_
 
 admin_users_host:
   - equinox
diff --git a/inventory/host_vars/ele-thetys.yml b/inventory/host_vars/ele-thetys.yml
index 5748333f..2d6bee1d 100644
--- a/inventory/host_vars/ele-thetys.yml
+++ b/inventory/host_vars/ele-thetys.yml
@@ -9,11 +9,12 @@ install:
 network:
   nameservers: "{{ network_zones.lan.dns }}"
   domain: "{{ host_domain }}"
-  primary:
-    interface: eno1
-    ip: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets[inventory_hostname]) | ipaddr('address') }}"
-    mask: "{{ network_zones.lan.prefix | ipaddr('netmask') }}"
+  primary: &_network_primary_
+    name: eno1
+    address: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets[inventory_hostname]) | ipaddr('address/prefix') }}"
     gateway: "{{ network_zones.lan.gateway }}"
+  interfaces:
+  - *_network_primary_
 
 admin_users_host:
   - equinox
diff --git a/inventory/host_vars/ele-uhrturm.yml b/inventory/host_vars/ele-uhrturm.yml
index ad0056b0..71c312cc 100644
--- a/inventory/host_vars/ele-uhrturm.yml
+++ b/inventory/host_vars/ele-uhrturm.yml
@@ -6,11 +6,12 @@ install:
 network:
   nameservers: "{{ network_zones.lan.dns }}"
   domain: "{{ host_domain }}"
-  primary:
-    interface: eno1
-    ip: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets[inventory_hostname]) | ipaddr('address') }}"
-    mask: "{{ network_zones.lan.prefix | ipaddr('netmask') }}"
+  primary: &_network_primary_
+    name: eno1
+    address: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets[inventory_hostname]) | ipaddr('address/prefix') }}"
     gateway: "{{ network_zones.lan.gateway }}"
+  interfaces:
+  - *_network_primary_
 
 ssh_users_root:
   - equinox
diff --git a/inventory/host_vars/lw-dione.yml b/inventory/host_vars/lw-dione.yml
index 19b44ff4..02738ee6 100644
--- a/inventory/host_vars/lw-dione.yml
+++ b/inventory/host_vars/lw-dione.yml
@@ -11,11 +11,12 @@ network:
   nameservers:
     - 9.9.9.9
   domain: "{{ host_domain }}"
-  primary:
-    interface: eno1
-    ip: 192.168.32.202
-    mask: 255.255.255.0
+  primary: &_network_primary_
+    name: eno1
+    address: 192.168.32.202/24
     gateway: 192.168.32.254
+  interfaces:
+  - *_network_primary_
 
 base_packages_extra_host:
   - exfat-fuse
diff --git a/inventory/host_vars/lw-helene.yml b/inventory/host_vars/lw-helene.yml
index c5a936d5..e7919ac7 100644
--- a/inventory/host_vars/lw-helene.yml
+++ b/inventory/host_vars/lw-helene.yml
@@ -11,11 +11,12 @@ network:
   nameservers:
     - 9.9.9.9
   domain: "{{ host_domain }}"
-  primary:
-    interface: eno1
-    ip: 192.168.32.203
-    mask: 255.255.255.0
+  primary: &_network_primary_
+    name: eno1
+    address: 192.168.32.203/24
     gateway: 192.168.32.254
+  interfaces:
+  - *_network_primary_
 
 base_packages_extra_host:
   - exfat-fuse
diff --git a/inventory/host_vars/lw-telesto.yml b/inventory/host_vars/lw-telesto.yml
index f25ad258..4a10338e 100644
--- a/inventory/host_vars/lw-telesto.yml
+++ b/inventory/host_vars/lw-telesto.yml
@@ -9,11 +9,12 @@ network:
   nameservers:
     - 9.9.9.9
   domain: "{{ host_domain }}"
-  primary:
-    interface: eno1
-    ip: 192.168.32.201
-    mask: 255.255.255.0
+  primary: &_network_primary_
+    name: eno1
+    address: 192.168.32.201/24
     gateway: 192.168.32.254
+  interfaces:
+  - *_network_primary_
 
 admin_users_host:
   - equinox
diff --git a/inventory/host_vars/lw-thetys.yml b/inventory/host_vars/lw-thetys.yml
index 75aa41f0..17b057b2 100644
--- a/inventory/host_vars/lw-thetys.yml
+++ b/inventory/host_vars/lw-thetys.yml
@@ -7,13 +7,15 @@ install:
     - "consoleblank=0"
 
 network:
-  nameservers: "9.9.9.9"
+  nameservers:
+    - 9.9.9.9
   domain: "{{ host_domain }}"
-  primary:
-    interface: eno1
-    ip: "192.168.28.202"
-    mask: "255.255.255.0"
-    gateway: "192.168.28.254"
+  primary: &_network_primary_
+    name: eno1
+    address: 192.168.28.202/24
+    gateway: 192.168.28.254
+  interfaces:
+  - *_network_primary_
 
 admin_users_host:
   - equinox