From b13af9ddfd01117b350243dd1cc483a35a420611 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Mon, 22 Jun 2020 01:12:15 +0200
Subject: all vm hosts/guests use the new network config schema

---
 inventory/host_vars/r3-vex2.yml | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

(limited to 'inventory/host_vars/r3-vex2.yml')

diff --git a/inventory/host_vars/r3-vex2.yml b/inventory/host_vars/r3-vex2.yml
index d43862e9..d5471743 100644
--- a/inventory/host_vars/r3-vex2.yml
+++ b/inventory/host_vars/r3-vex2.yml
@@ -1,11 +1,8 @@
 ---
 apt_repo_provider: ffgraz
 
-_vm_host_: ch-atlas
-
 install:
   vm:
-    host: "{{ _vm_host_ }}"
     mem: 2048
     numcpu: 2
     autostart: True
@@ -14,22 +11,24 @@ install:
     scsi:
       sda:
         type: lvm
-        vg: "{{ hostvars[_vm_host_].host_name }}"
+        vg: "{{ hostvars[vm_host.name].host_name }}"
         lv: "{{ inventory_hostname }}"
         size: 15g
   interfaces:
   - bridge: br-public
     name: primary0
+    mac: 52:54:00:f9:e6:6f
 
 network:
   nameservers: "{{ hostvars[_vm_host_].vm_host.network.dns }}"
   domain: "{{ host_domain }}"
   systemd_link:
     interfaces: "{{ install.interfaces }}"
-  primary:
-    interface: primary0
-    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 }}"
+  primary: &_network_primary_
+    name: primary0
+    address: "{{ vm_host.network.bridges.public.prefix | ipaddr(vm_host.network.bridges.public.offsets[inventory_hostname]) | ipaddr('address/prefix') }}"
+    gateway: "{{ vm_host.network.bridges.public.gateway }}"
+    address6: "{{ vm_host.network.bridges.public.prefix6 | ipaddr(vm_host.network.bridges.public.offsets[inventory_hostname]) | ipaddr('address/prefix') }}"
+    gateway6: "{{ vm_host.network.bridges.public.gateway6 }}"
+  interfaces:
+  - *_network_primary_
-- 
cgit v1.2.3