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-keyserver.yml | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

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

diff --git a/inventory/host_vars/ch-keyserver.yml b/inventory/host_vars/ch-keyserver.yml
index f122b0ed..851116a5 100644
--- a/inventory/host_vars/ch-keyserver.yml
+++ b/inventory/host_vars/ch-keyserver.yml
@@ -1,34 +1,35 @@
 ---
 apt_repo_provider: ffgraz
 
-vm_host: ch-atlas
+_vm_host_: ch-atlas
 
 install:
-  host: "{{ vm_host }}"
-  mem: 2048
-  numcpu: 2
+  vm:
+    host: "{{ _vm_host_ }}"
+    mem: 2048
+    numcpu: 2
+    autostart: True
   disks:
     primary: /dev/sda
     scsi:
       sda:
         type: lvm
-        vg: "{{ hostvars[vm_host].host_name }}"
+        vg: "{{ hostvars[_vm_host_].host_name }}"
         lv: "{{ inventory_hostname }}"
         size: 10g
   interfaces:
   - bridge: br-public
     name: primary0
-  autostart: True
 
 network:
-  nameservers: "{{ hostvars[vm_host].vm_host.network.dns }}"
+  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 }}"
+    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 }}"
-- 
cgit v1.2.3