From 5796a352aa7b5396decbea1fbc9ef32378a71863 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Mon, 11 Dec 2017 01:06:27 +0100 Subject: greatly improved vm-install role --- host_vars/elesearch.yaml | 8 +++++--- host_vars/kube2016.yaml | 37 +++++++++++++++++++++++++++---------- host_vars/sk2013.yaml | 30 ++++++++++++++++++++++++++++++ host_vars/sk2016.yaml | 10 ++++++++++ 4 files changed, 72 insertions(+), 13 deletions(-) create mode 100644 host_vars/sk2013.yaml (limited to 'host_vars') diff --git a/host_vars/elesearch.yaml b/host_vars/elesearch.yaml index f1611f47..296f562e 100644 --- a/host_vars/elesearch.yaml +++ b/host_vars/elesearch.yaml @@ -1,3 +1,4 @@ +--- vm_install: host: sk2013 mem: 1024 @@ -10,10 +11,11 @@ vm_install: lv: "{{ inventory_hostname }}" size: 50g interfaces: - - idx: 1 - bridge: virbr - name: public0 + - idx: 1 + bridge: virbr + name: public0 autostart: True + vm_network: systemd_link: interfaces: "{{ vm_install.interfaces }}" diff --git a/host_vars/kube2016.yaml b/host_vars/kube2016.yaml index 49d6f976..f174ff3b 100644 --- a/host_vars/kube2016.yaml +++ b/host_vars/kube2016.yaml @@ -1,5 +1,9 @@ +--- +vm_install_host: sk2016 +vm_network_primary_address_index: 200 + vm_install: - host: sk2016 + host: "{{ vm_install_host }}" mem: 8192 numcpu: 6 disks: @@ -10,17 +14,30 @@ vm_install: lv: "{{ inventory_hostname }}" size: 100g interfaces: - - idx: 1 - bridge: virbr - name: internet0 + - idx: 1 + bridge: "{{ hostvars[vm_install_host].vm_host.network.interface }}" + name: primary0 autostart: True + vm_network: systemd_link: interfaces: "{{ vm_install.interfaces }}" - internet: - interface: internet0 - ip: 192.168.216.200 - mask: 255.255.255.0 - gateway: 192.168.216.254 - nameservers: 9.9.9.9 + primary: + interface: primary0 + ip: "{{ (hostvars[vm_install_host].vm_host.network.ip+'/'+hostvars[vm_install_host].vm_host.network.mask) | ipaddr(vm_network_primary_address_index) | ipaddr('address') }}" + mask: "{{ hostvars[vm_install_host].vm_host.network.mask }}" + gateway: "{{ hostvars[vm_install_host].vm_host.network.ip }}" + nameservers: "{{ hostvars[vm_install_host].vm_host.network.nameservers }}" domain: spreadspace.org + +docker_lvm: + vg: kube2016 + lv: docker + size: 15G + fs: ext4 + +kubelet_lvm: + vg: kube2016 + lv: kubelet + size: 10G + fs: ext4 diff --git a/host_vars/sk2013.yaml b/host_vars/sk2013.yaml new file mode 100644 index 00000000..91d1854d --- /dev/null +++ b/host_vars/sk2013.yaml @@ -0,0 +1,30 @@ +--- +sshserver_allowusers_host: +- backuppc +- equinox +- dan + +vm_host: + installer: + net_if: virbr + preseed_path: /srv/preseed + path: /srv/installer + distros: + - distro: debian + codename: stretch + arch: + - amd64 + - i386 + - distro: ubuntu + codename: xenial + arch: + - amd64 + - i386 + network: + interface: virbr + ip: 192.168.216.254 + mask: 255.255.255.0 + nameservers: + - 213.133.100.100 + - 213.133.98.98 + - 213.133.99.99 diff --git a/host_vars/sk2016.yaml b/host_vars/sk2016.yaml index ecfc12d4..91d1854d 100644 --- a/host_vars/sk2016.yaml +++ b/host_vars/sk2016.yaml @@ -1,7 +1,9 @@ +--- sshserver_allowusers_host: - backuppc - equinox - dan + vm_host: installer: net_if: virbr @@ -18,3 +20,11 @@ vm_host: arch: - amd64 - i386 + network: + interface: virbr + ip: 192.168.216.254 + mask: 255.255.255.0 + nameservers: + - 213.133.100.100 + - 213.133.98.98 + - 213.133.99.99 -- cgit v1.2.3