From 607bc14c38dcd0b416f4caefdcb41b0a74012a55 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Thu, 11 Jun 2020 17:53:55 +0200
Subject: harmonize vm install config

---
 inventory/host_vars/ch-hroottest-obsd.yml | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

(limited to 'inventory/host_vars/ch-hroottest-obsd.yml')

diff --git a/inventory/host_vars/ch-hroottest-obsd.yml b/inventory/host_vars/ch-hroottest-obsd.yml
index 292e8101..61476370 100644
--- a/inventory/host_vars/ch-hroottest-obsd.yml
+++ b/inventory/host_vars/ch-hroottest-obsd.yml
@@ -1,10 +1,12 @@
 ---
-vm_host: ch-hroottest
+_vm_host_: ch-hroottest
 
 install:
-  host: "{{ vm_host }}"
-  mem: 1024
-  numcpu: 1
+  vm:
+    host: "{{ _vm_host_ }}"
+    mem: 1024
+    numcpu: 1
+    autostart: True
   disks:
     primary: /dev/vda
     virtio:
@@ -15,13 +17,12 @@ install:
   interfaces:
   - bridge: br-public
     name: vio0
-  autostart: True
 
 network:
-  nameservers: "{{ hostvars[vm_host].vm_host.network.dns }}"
+  nameservers: "{{ hostvars[_vm_host_].vm_host.network.dns }}"
   domain: "{{ host_domain }}"
   primary:
     interface: vio0
-    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') }}"
+    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') }}"
-- 
cgit v1.2.3