From 79d662045cba5c0c424f884e6de2ba11d90c530d Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Fri, 5 Jul 2019 19:50:27 +0200 Subject: bugfixes and cleanup of vm/install --- inventory/host_vars/ch-atlas.yml | 4 +--- inventory/host_vars/ch-keyserver.yml | 15 +++++++-------- inventory/host_vars/emc-master.yml | 2 +- inventory/host_vars/emc-stats.yml | 2 +- inventory/host_vars/sk2013.yml | 4 +--- inventory/host_vars/sk2016.yml | 4 +--- 6 files changed, 12 insertions(+), 19 deletions(-) (limited to 'inventory/host_vars') diff --git a/inventory/host_vars/ch-atlas.yml b/inventory/host_vars/ch-atlas.yml index 7c1c26a1..d59ed529 100644 --- a/inventory/host_vars/ch-atlas.yml +++ b/inventory/host_vars/ch-atlas.yml @@ -1,7 +1,5 @@ --- vm_host: - installer: - net_if: extbr network: prefix: 89.106.215.29/28 gw: 89.106.215.30 @@ -10,6 +8,6 @@ vm_host: dns: - 89.106.208.7 - 89.106.208.12 - indices: + offsets: ch-keyserver: 3 r3-vex2: 11 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 }}" diff --git a/inventory/host_vars/emc-master.yml b/inventory/host_vars/emc-master.yml index d590908e..04ba1d84 100644 --- a/inventory/host_vars/emc-master.yml +++ b/inventory/host_vars/emc-master.yml @@ -24,7 +24,7 @@ network: interfaces: "{{ install.interfaces }}" primary: interface: primary0 - ip: "{{ (hostvars[vm_host].vm_host.network.ip+'/'+hostvars[vm_host].vm_host.network.mask) | ipaddr(hostvars[vm_host].vm_host.network.indices[inventory_hostname]) | ipaddr('address') }}" + ip: "{{ (hostvars[vm_host].vm_host.network.ip+'/'+hostvars[vm_host].vm_host.network.mask) | ipaddr(hostvars[vm_host].vm_host.network.offsets[inventory_hostname]) | ipaddr('address') }}" mask: "{{ hostvars[vm_host].vm_host.network.mask }}" gateway: "{{ hostvars[vm_host].vm_host.network.gateway | default(hostvars[vm_host].vm_host.network.ip) }}" diff --git a/inventory/host_vars/emc-stats.yml b/inventory/host_vars/emc-stats.yml index e6de5859..59351996 100644 --- a/inventory/host_vars/emc-stats.yml +++ b/inventory/host_vars/emc-stats.yml @@ -28,7 +28,7 @@ network: interfaces: "{{ install.interfaces }}" primary: interface: primary0 - ip: "{{ (hostvars[vm_host].vm_host.network.ip+'/'+hostvars[vm_host].vm_host.network.mask) | ipaddr(hostvars[vm_host].vm_host.network.indices[inventory_hostname]) | ipaddr('address') }}" + ip: "{{ (hostvars[vm_host].vm_host.network.ip+'/'+hostvars[vm_host].vm_host.network.mask) | ipaddr(hostvars[vm_host].vm_host.network.offsets[inventory_hostname]) | ipaddr('address') }}" mask: "{{ hostvars[vm_host].vm_host.network.mask }}" gateway: "{{ hostvars[vm_host].vm_host.network.gateway | default(hostvars[vm_host].vm_host.network.ip) }}" diff --git a/inventory/host_vars/sk2013.yml b/inventory/host_vars/sk2013.yml index 21e2b29a..028d7de0 100644 --- a/inventory/host_vars/sk2013.yml +++ b/inventory/host_vars/sk2013.yml @@ -5,8 +5,6 @@ ssh_allowusers_host: - dan vm_host: - installer: - net_if: virbr network: interface: virbr ip: 192.168.160.254 @@ -15,5 +13,5 @@ vm_host: - 213.133.100.100 - 213.133.98.98 - 213.133.99.99 - indices: + offsets: emc-master: 141 diff --git a/inventory/host_vars/sk2016.yml b/inventory/host_vars/sk2016.yml index 9e4827f0..5f77ede0 100644 --- a/inventory/host_vars/sk2016.yml +++ b/inventory/host_vars/sk2016.yml @@ -5,8 +5,6 @@ ssh_allowusers_host: - dan vm_host: - installer: - net_if: virbr network: interface: virbr ip: 192.168.216.254 @@ -15,5 +13,5 @@ vm_host: - 213.133.100.100 - 213.133.98.98 - 213.133.99.99 - indices: + offsets: emc-stats: 200 -- cgit v1.2.3