diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2020-04-23 01:24:38 +0200 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2020-04-23 01:24:38 +0200 |
| commit | 17077868e615fa7115abdb03a5af4662ab0a3679 (patch) | |
| tree | 22cb752792c3410bcfe8ce856b9746cad1ccf8d3 /roles/vm/define/templates | |
| parent | remove spreadspace k8s-test cluster (diff) | |
refactor all install roles ans playbooks to work with new variable install_hostname
Diffstat (limited to 'roles/vm/define/templates')
| -rw-r--r-- | roles/vm/define/templates/libvirt-domain.xml.j2 | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/roles/vm/define/templates/libvirt-domain.xml.j2 b/roles/vm/define/templates/libvirt-domain.xml.j2 index 780d1bae..3465cec0 100644 --- a/roles/vm/define/templates/libvirt-domain.xml.j2 +++ b/roles/vm/define/templates/libvirt-domain.xml.j2 @@ -1,13 +1,13 @@ <domain type='kvm'> - <name>{{ hostname }}</name> - <memory>{{ hostvars[hostname].install_cooked.mem * 1024 }}</memory> - <currentMemory>{{ hostvars[hostname].install_cooked.mem * 1024 }}</currentMemory> - <vcpu>{{ hostvars[hostname].install_cooked.numcpu }}</vcpu> + <name>{{ install_hostname }}</name> + <memory>{{ hostvars[install_hostname].install_cooked.mem * 1024 }}</memory> + <currentMemory>{{ hostvars[install_hostname].install_cooked.mem * 1024 }}</currentMemory> + <vcpu>{{ hostvars[install_hostname].install_cooked.numcpu }}</vcpu> <os> <type arch='x86_64' machine='pc-0.12'>hvm</type> {% if vm_define_installer %} {% if install_distro == 'debian' or install_distro == 'ubuntu' %} - <kernel>{{ installer_path }}/{{ install_distro }}-{{ install_codename }}/{{ hostvars[hostname].install_cooked.arch | default('amd64') }}/linux</kernel> + <kernel>{{ installer_path }}/{{ install_distro }}-{{ install_codename }}/{{ hostvars[install_hostname].install_cooked.arch | default('amd64') }}/linux</kernel> <initrd>{{ preseed_tmpdir }}/initrd.preseed.gz</initrd> <cmdline>console=ttyS0,115200n8</cmdline> <boot dev='hd'/> @@ -50,8 +50,8 @@ </disk> {% endif %} -{% if 'virtio' in hostvars[hostname].install_cooked.disks %} -{% for device, src in hostvars[hostname].install_cooked.disks.virtio.items() %} +{% if 'virtio' in hostvars[install_hostname].install_cooked.disks %} +{% for device, src in hostvars[install_hostname].install_cooked.disks.virtio.items() %} <disk type='block' device='disk'> <driver name='qemu' type='raw' cache='none' discard='unmap'/> {% if src.type == 'lvm' %} @@ -64,9 +64,9 @@ {% endfor %} {% endif %} -{% if 'scsi' in hostvars[hostname].install_cooked.disks %} +{% if 'scsi' in hostvars[install_hostname].install_cooked.disks %} <controller type='scsi' index='0' model='virtio-scsi'/> -{% for device, src in hostvars[hostname].install_cooked.disks.scsi.items() %} +{% for device, src in hostvars[install_hostname].install_cooked.disks.scsi.items() %} <disk type='block' device='disk'> <driver name='qemu' type='raw' cache='none' discard='unmap'/> {% if src.type == 'lvm' %} @@ -79,8 +79,8 @@ {% endfor %} {% endif %} -{% if hostvars[hostname].install_cooked.interfaces %} -{% for if in hostvars[hostname].install_cooked.interfaces %} +{% if hostvars[install_hostname].install_cooked.interfaces %} +{% for if in hostvars[install_hostname].install_cooked.interfaces %} <interface type='bridge'> {% if 'mac' in if %} <mac address='{{ if.mac }}'/> |