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/sk-tomnext-hp.yml | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

(limited to 'inventory/host_vars/sk-tomnext-hp.yml')

diff --git a/inventory/host_vars/sk-tomnext-hp.yml b/inventory/host_vars/sk-tomnext-hp.yml
index 667cb76d..2db59ed3 100644
--- a/inventory/host_vars/sk-tomnext-hp.yml
+++ b/inventory/host_vars/sk-tomnext-hp.yml
@@ -1,9 +1,11 @@
 ---
-_vm_host_: sk-tomnext
+ssh_users_root:
+  - equinox
+  - dan
+  - antares
 
 install:
   vm:
-    host: "{{ _vm_host_ }}"
     mem: 8192
     numcpu: 4
     autostart: True
@@ -13,7 +15,7 @@ install:
       sda:
         type: zfs
         name: root
-        size: 20g
+        size: 25g
   interfaces:
   - bridge: br-public
     name: primary0
@@ -21,15 +23,16 @@ install:
 vm_guest_autologin_on_serial: no
 
 network:
-  nameservers: "{{ hostvars[_vm_host_].vm_host.network.dns }}"
+  nameservers: "{{ 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.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] }}"
+  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.prefix | ipaddr(vm_host.network.bridges.public.offsets[vm_host.name]) | ipaddr('address') }}"
+    overlay: "{{ (vm_host.network.bridges.public.overlay.prefix | ipaddr(vm_host.network.bridges.public.overlay.offsets[inventory_hostname])).split('/')[0] }}"
+  interfaces:
+  - *_network_primary_
 
 external_ip: "{{ network.primary.overlay }}"
-- 
cgit v1.2.3