fix network config of atlas based vms

3 files changed, 18 insertions, 18 deletions

diff --git a/inventory/host_vars/ch-keyserver.yml b/inventory/host_vars/ch-keyserver.yml
index 397d526f..f122b0ed 100644
--- a/inventory/host_vars/ch-keyserver.yml
+++ b/inventory/host_vars/ch-keyserver.yml
@@ -16,7 +16,7 @@ install:
         lv: "{{ inventory_hostname }}"
         size: 10g
   interfaces:
-  - bridge: extbr
+  - bridge: br-public
     name: primary0
   autostart: True
 
@@ -27,8 +27,8 @@ 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.gateway }}"
-    prefix6: "{{ hostvars[vm_host].vm_host.network.prefix6 | ipaddr(hostvars[vm_host].vm_host.network.offsets[inventory_hostname]) | ipaddr('address/prefix') }}"
-    gateway6: "{{ hostvars[vm_host].vm_host.network.gateway6 }}"
+    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.gateway }}"
+    prefix6: "{{ hostvars[vm_host].vm_host.network.bridges.public.prefix6 | ipaddr(hostvars[vm_host].vm_host.network.bridges.public.offsets[inventory_hostname]) | ipaddr('address/prefix') }}"
+    gateway6: "{{ hostvars[vm_host].vm_host.network.bridges.public.gateway6 }}"
diff --git a/inventory/host_vars/ch-testvm.yml b/inventory/host_vars/ch-testvm.yml
index 992dde45..29ed1e14 100644
--- a/inventory/host_vars/ch-testvm.yml
+++ b/inventory/host_vars/ch-testvm.yml
@@ -16,7 +16,7 @@ install:
         lv: "{{ inventory_hostname }}"
         size: 5g
   interfaces:
-  - bridge: extbr
+  - bridge: br-public
     name: primary0
   autostart: False
 
@@ -27,8 +27,8 @@ 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.gateway }}"
-    prefix6: "{{ hostvars[vm_host].vm_host.network.prefix6 | ipaddr(hostvars[vm_host].vm_host.network.offsets[inventory_hostname]) | ipaddr('address/prefix') }}"
-    gateway6: "{{ hostvars[vm_host].vm_host.network.gateway6 }}"
+    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.gateway }}"
+    prefix6: "{{ hostvars[vm_host].vm_host.network.bridges.public.prefix6 | ipaddr(hostvars[vm_host].vm_host.network.bridges.public.offsets[inventory_hostname]) | ipaddr('address/prefix') }}"
+    gateway6: "{{ hostvars[vm_host].vm_host.network.bridges.public.gateway6 }}"
diff --git a/inventory/host_vars/r3-vex2.yml b/inventory/host_vars/r3-vex2.yml
index a8ea4810..f700f26f 100644
--- a/inventory/host_vars/r3-vex2.yml
+++ b/inventory/host_vars/r3-vex2.yml
@@ -16,7 +16,7 @@ install:
         lv: "{{ inventory_hostname }}"
         size: 15g
   interfaces:
-  - bridge: extbr
+  - bridge: br-public
     name: primary0
   autostart: True
 
@@ -27,8 +27,8 @@ 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.gateway }}"
-    prefix6: "{{ hostvars[vm_host].vm_host.network.prefix6 | ipaddr(hostvars[vm_host].vm_host.network.offsets[inventory_hostname]) | ipaddr('address/prefix') }}"
-    gateway6: "{{ hostvars[vm_host].vm_host.network.gateway6 }}"
+    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.gateway }}"
+    prefix6: "{{ hostvars[vm_host].vm_host.network.bridges.public.prefix6 | ipaddr(hostvars[vm_host].vm_host.network.bridges.public.offsets[inventory_hostname]) | ipaddr('address/prefix') }}"
+    gateway6: "{{ hostvars[vm_host].vm_host.network.bridges.public.gateway6 }}"