improve vm-host network config

4 files changed, 26 insertions, 26 deletions

diff --git a/inventory/host_vars/ch-mimas.yml b/inventory/host_vars/ch-mimas.yml
index e073d7bc..79246de5 100644
--- a/inventory/host_vars/ch-mimas.yml
+++ b/inventory/host_vars/ch-mimas.yml
@@ -25,7 +25,7 @@ network:
     interfaces: "{{ install.interfaces }}"
   primary:
     interface: eth0
-    ip: "{{ hostvars[vm_host].vm_host.network.prefix | ipaddr(hostvars[vm_host].vm_host.network.offsets[inventory_hostname]) | ipaddr('address') }}"
-    mask: "{{ hostvars[vm_host].vm_host.network.prefix | ipaddr('netmask') }}"
-    gateway: "{{ hostvars[vm_host].vm_host.network.prefix | ipaddr('address') }}"
-    public: "{{ (hostvars[vm_host].vm_host.network.public.prefix | ipaddr(hostvars[vm_host].vm_host.network.public.mappings[inventory_hostname])).split('/')[0] }}"
+    ip: "{{ hostvars[vm_host].vm_host.network.bridges.public.prefix | ipaddr(hostvars[vm_host].vm_host.network.bridges.public.offsets[inventory_hostname]) | ipaddr('address') }}"
+    mask: "{{ hostvars[vm_host].vm_host.network.bridges.public.prefix | ipaddr('netmask') }}"
+    gateway: "{{ hostvars[vm_host].vm_host.network.bridges.public.prefix | ipaddr('address') }}"
+    overlay: "{{ (hostvars[vm_host].vm_host.network.bridges.public.overlay.prefix | ipaddr(hostvars[vm_host].vm_host.network.bridges.public.overlay.offsets[inventory_hostname])).split('/')[0] }}"
diff --git a/inventory/host_vars/sk-2019vm.yml b/inventory/host_vars/sk-2019vm.yml
index a24ebf41..b2061380 100644
--- a/inventory/host_vars/sk-2019vm.yml
+++ b/inventory/host_vars/sk-2019vm.yml
@@ -13,24 +13,24 @@ base_intel_nic_stability_fix: true
 
 vm_host:
   network:
-    interface: br-public
-    prefix: 192.168.250.254/24
     dns:
     - 213.133.100.100
     - 213.133.98.98
     - 213.133.99.99
-    offsets:
-      sk-torrent: 136
-      ch-mimas: 143
-      sk-testvm: 253
-    nat: yes
-    public:
-      prefix: 178.63.180.136/29
-      mappings:
-        sk-torrent: 0
-        ch-mimas: 6
-        sk-testvm: 7
-
+    bridges:
+      public:
+        prefix: 192.168.250.254/24
+        offsets:
+          sk-torrent: 136
+          ch-mimas: 143
+          sk-testvm: 253
+        nat: yes
+        overlay:
+          prefix: 178.63.180.136/29
+          offsets:
+            sk-torrent: 0
+            ch-mimas: 6
+            sk-testvm: 7
 
 ssh_keys_root: "{{ ssh_keys.equinox[env_group] + ssh_keys.dan }}"
 
diff --git a/inventory/host_vars/sk-testvm.yml b/inventory/host_vars/sk-testvm.yml
index 4f740d4b..bad899e5 100644
--- a/inventory/host_vars/sk-testvm.yml
+++ b/inventory/host_vars/sk-testvm.yml
@@ -25,10 +25,10 @@ network:
     interfaces: "{{ install.interfaces }}"
   primary:
     interface: primary0
-    ip: "{{ hostvars[vm_host].vm_host.network.prefix | ipaddr(hostvars[vm_host].vm_host.network.offsets[inventory_hostname]) | ipaddr('address') }}"
-    mask: "{{ hostvars[vm_host].vm_host.network.prefix | ipaddr('netmask') }}"
-    gateway: "{{ hostvars[vm_host].vm_host.network.prefix | ipaddr('address') }}"
-    public: "{{ (hostvars[vm_host].vm_host.network.public.prefix | ipaddr(hostvars[vm_host].vm_host.network.public.mappings[inventory_hostname])).split('/')[0] }}"
+    ip: "{{ hostvars[vm_host].vm_host.network.bridges.public.prefix | ipaddr(hostvars[vm_host].vm_host.network.bridges.public.offsets[inventory_hostname]) | ipaddr('address') }}"
+    mask: "{{ hostvars[vm_host].vm_host.network.bridges.public.prefix | ipaddr('netmask') }}"
+    gateway: "{{ hostvars[vm_host].vm_host.network.bridges.public.prefix | ipaddr('address') }}"
+    overlay: "{{ (hostvars[vm_host].vm_host.network.bridges.public.overlay.prefix | ipaddr(hostvars[vm_host].vm_host.network.bridges.public.overlay.offsets[inventory_hostname])).split('/')[0] }}"
 
 
 ### this machine will be used to migrate wolke.chaox.org:
diff --git a/inventory/host_vars/sk-torrent.yml b/inventory/host_vars/sk-torrent.yml
index 631e7dca..cdf5f94a 100644
--- a/inventory/host_vars/sk-torrent.yml
+++ b/inventory/host_vars/sk-torrent.yml
@@ -30,9 +30,9 @@ network:
     interfaces: "{{ install.interfaces }}"
   primary:
     interface: primary0
-    ip: "{{ hostvars[vm_host].vm_host.network.prefix | ipaddr(hostvars[vm_host].vm_host.network.offsets[inventory_hostname]) | ipaddr('address') }}"
-    mask: "{{ hostvars[vm_host].vm_host.network.prefix | ipaddr('netmask') }}"
-    gateway: "{{ hostvars[vm_host].vm_host.network.prefix | ipaddr('address') }}"
-    public: "{{ (hostvars[vm_host].vm_host.network.public.prefix | ipaddr(hostvars[vm_host].vm_host.network.public.mappings[inventory_hostname])).split('/')[0] }}"
+    ip: "{{ hostvars[vm_host].vm_host.network.bridges.public.prefix | ipaddr(hostvars[vm_host].vm_host.network.bridges.public.offsets[inventory_hostname]) | ipaddr('address') }}"
+    mask: "{{ hostvars[vm_host].vm_host.network.bridges.public.prefix | ipaddr('netmask') }}"
+    gateway: "{{ hostvars[vm_host].vm_host.network.bridges.public.prefix | ipaddr('address') }}"
+    overlay: "{{ (hostvars[vm_host].vm_host.network.bridges.public.overlay.prefix | ipaddr(hostvars[vm_host].vm_host.network.bridges.public.overlay.offsets[inventory_hostname])).split('/')[0] }}"
 
 transmission_rpc_password: "{{ vault_transmission_rpc_password }}"