From 79d662045cba5c0c424f884e6de2ba11d90c530d Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Fri, 5 Jul 2019 19:50:27 +0200
Subject: bugfixes and cleanup of vm/install

---
 inventory/host_vars/ch-keyserver.yml | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 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 d20cbbe6..b81455eb 100644
--- a/inventory/host_vars/ch-keyserver.yml
+++ b/inventory/host_vars/ch-keyserver.yml
@@ -6,25 +6,24 @@ install:
   mem: 2048
   numcpu: 2
   disks:
-    primary: sda
+    primary: /dev/sda
     scsi:
       sda:
-        vg: "{{ vm_host }}"
+        vg: "{{ hostvars[vm_host].host_name }}"
         lv: "{{ inventory_hostname }}"
         size: 10g
   interfaces:
-  - bridge: "{{ hostvars[vm_host].vm_host.network.interface }}"
+  - bridge: extbr
     name: primary0
   autostart: True
 
 network:
-  nameservers: "{{ hostvars[vm_host].vm_host.network.nameservers }}"
+  nameservers: "{{ hostvars[vm_host].vm_host.network.dns }}"
   domain: "{{ host_domain }}"
   systemd_link:
     interfaces: "{{ install.interfaces }}"
   primary:
     interface: primary0
-    ipv4:
-      addr: "{{ hostvars[vm_host].vm_host.network.ipv4.addr | ipsubnet(hostvars[vm_host].vm_host.network.ipv4.prefix) | ipaddr(hostvars[vm_host].vm_host.network.indices[inventory_hostname]) | ipaddr('address') }}"
-      prefix: "{{ hostvars[vm_host].vm_host.network.ipv4.prefix }}"
-      gateway: "{{ hostvars[vm_host].vm_host.network.ipv4.gateway | default(hostvars[vm_host].vm_host.network.ipv4.addr) }}"
+    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.gw }}"
-- 
cgit v1.2.3