diff options
author | Christian Pointner <equinox@spreadspace.org> | 2018-05-25 02:04:16 +0200 |
---|---|---|
committer | Christian Pointner <equinox@spreadspace.org> | 2018-05-25 02:04:16 +0200 |
commit | 46787e1c9b9c574a13dae748d2f8ff89e7b55b8e (patch) | |
tree | 8a6c10959f53886565d873595d3c285fefbe9039 /host_vars | |
parent | move kubernetes roles to subdir (diff) |
remerge vm roles from realraum noc repo
Diffstat (limited to 'host_vars')
-rw-r--r-- | host_vars/elesearch.yml | 18 | ||||
-rw-r--r-- | host_vars/emc-master.yml | 9 | ||||
-rw-r--r-- | host_vars/emc-stats.yml | 9 | ||||
-rw-r--r-- | host_vars/sk2016.yml | 1 |
4 files changed, 21 insertions, 16 deletions
diff --git a/host_vars/elesearch.yml b/host_vars/elesearch.yml index 296f562e..26c2e792 100644 --- a/host_vars/elesearch.yml +++ b/host_vars/elesearch.yml @@ -1,6 +1,8 @@ --- +vm_install_host: sk2016 + vm_install: - host: sk2013 + host: "{{ vm_install_host }}" mem: 1024 numcpu: 4 disks: @@ -11,13 +13,17 @@ vm_install: lv: "{{ inventory_hostname }}" size: 50g interfaces: - - idx: 1 - bridge: virbr - name: public0 + - bridge: "{{ hostvars[vm_install_host].vm_host.network.interface }}" + name: primary0 autostart: True vm_network: + nameservers: "{{ hostvars[vm_install_host].vm_host.network.nameservers }}" + domain: elevate.at systemd_link: interfaces: "{{ vm_install.interfaces }}" - internet: - interface: public0 + primary: + interface: primary0 + ip: "{{ (hostvars[vm_install_host].vm_host.network.ip+'/'+hostvars[vm_install_host].vm_host.network.mask) | ipaddr(hostvars[vm_install_host].vm_host.network.indices[inventory_hostname]) | ipaddr('address') }}" + mask: "{{ hostvars[vm_install_host].vm_host.network.mask }}" + gateway: "{{ hostvars[vm_install_host].vm_host.network.gateway | default(hostvars[vm_install_host].vm_host.network.ip) }}" diff --git a/host_vars/emc-master.yml b/host_vars/emc-master.yml index 5b9f52b9..95b3062a 100644 --- a/host_vars/emc-master.yml +++ b/host_vars/emc-master.yml @@ -13,21 +13,20 @@ vm_install: lv: "{{ inventory_hostname }}" size: 42g interfaces: - - idx: 1 - bridge: "{{ hostvars[vm_install_host].vm_host.network.interface }}" + - bridge: "{{ hostvars[vm_install_host].vm_host.network.interface }}" name: primary0 autostart: True vm_network: + nameservers: "{{ hostvars[vm_install_host].vm_host.network.nameservers }}" + domain: spreadspace.org systemd_link: interfaces: "{{ vm_install.interfaces }}" primary: interface: primary0 ip: "{{ (hostvars[vm_install_host].vm_host.network.ip+'/'+hostvars[vm_install_host].vm_host.network.mask) | ipaddr(hostvars[vm_install_host].vm_host.network.indices[inventory_hostname]) | 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 + gateway: "{{ hostvars[vm_install_host].vm_host.network.gateway | default(hostvars[vm_install_host].vm_host.network.ip) }}" docker_lvm: vg: "{{ inventory_hostname }}" diff --git a/host_vars/emc-stats.yml b/host_vars/emc-stats.yml index 64917b8e..89352b4f 100644 --- a/host_vars/emc-stats.yml +++ b/host_vars/emc-stats.yml @@ -17,21 +17,20 @@ vm_install: lv: "{{ inventory_hostname }}-data" size: 100g interfaces: - - idx: 1 - bridge: "{{ hostvars[vm_install_host].vm_host.network.interface }}" + - bridge: "{{ hostvars[vm_install_host].vm_host.network.interface }}" name: primary0 autostart: True vm_network: + nameservers: "{{ hostvars[vm_install_host].vm_host.network.nameservers }}" + domain: spreadspace.org systemd_link: interfaces: "{{ vm_install.interfaces }}" primary: interface: primary0 ip: "{{ (hostvars[vm_install_host].vm_host.network.ip+'/'+hostvars[vm_install_host].vm_host.network.mask) | ipaddr(hostvars[vm_install_host].vm_host.network.indices[inventory_hostname]) | 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 + gateway: "{{ hostvars[vm_install_host].vm_host.network.gateway | default(hostvars[vm_install_host].vm_host.network.ip) }}" docker_lvm: vg: "{{ inventory_hostname }}" diff --git a/host_vars/sk2016.yml b/host_vars/sk2016.yml index 872223db..1d664433 100644 --- a/host_vars/sk2016.yml +++ b/host_vars/sk2016.yml @@ -30,3 +30,4 @@ vm_host: - 213.133.99.99 indices: emc-stats: 200 + elesearch: 201 |