diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2020-11-21 04:44:34 +0100 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2020-11-21 04:44:34 +0100 |
| commit | 48d0df39753037b6688c55a372254ef9ecae5631 (patch) | |
| tree | ed7c92eac51186d1284c2fe5005b7efa7d3411ae /roles/vm/guest/define/templates/libvirt-domain.xml.j2 | |
| parent | use delegation for vm/guest install and define (diff) | |
don't use install_hostname variable in roles
Diffstat (limited to 'roles/vm/guest/define/templates/libvirt-domain.xml.j2')
| -rw-r--r-- | roles/vm/guest/define/templates/libvirt-domain.xml.j2 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/roles/vm/guest/define/templates/libvirt-domain.xml.j2 b/roles/vm/guest/define/templates/libvirt-domain.xml.j2 index ce8a48d4..28f237a9 100644 --- a/roles/vm/guest/define/templates/libvirt-domain.xml.j2 +++ b/roles/vm/guest/define/templates/libvirt-domain.xml.j2 @@ -1,5 +1,5 @@ <domain type='kvm'> - <name>{{ install_hostname }}</name> + <name>{{ inventory_hostname }}</name> <memory>{{ ((install_cooked.vm.memory | human_to_bytes) / 1024) | int }}</memory> <currentMemory>{{ ((install_cooked.vm.memory | human_to_bytes) / 1024) | int }}</currentMemory> <vcpu>{{ install_cooked.vm.numcpus }}</vcpu> @@ -44,7 +44,7 @@ {% if vm_define_installer and install_distro == 'openbsd' %} <disk type='file' device='cdrom'> <driver name='qemu'/> - <source file='{{ installer_tmpdir }}/{{ install_hostname }}.iso'/> + <source file='{{ installer_tmpdir }}/{{ inventory_hostname }}.iso'/> <target dev='hdc' bus='ide'/> <readonly/> </disk> @@ -57,7 +57,7 @@ {% if src.type == 'lvm' %} <source dev='/dev/mapper/{{ src.vg | replace('-', '--') }}-{{ src.lv | replace('-', '--') }}'/> {% elif src.type == 'zfs' %} - <source dev='/dev/zvol/{{ vm_host_cooked.zfs[src.backend | default('default')].pool }}/{{ vm_host_cooked.zfs[src.backend | default('default')].name }}/{{ install_hostname }}/{{ src.name }}'/> + <source dev='/dev/zvol/{{ vm_host_cooked.zfs[src.backend | default('default')].pool }}/{{ vm_host_cooked.zfs[src.backend | default('default')].name }}/{{ inventory_hostname }}/{{ src.name }}'/> {% endif %} <target dev='{{ device }}' bus='virtio'/> </disk> @@ -72,7 +72,7 @@ {% if src.type == 'lvm' %} <source dev='/dev/mapper/{{ src.vg | replace('-', '--') }}-{{ src.lv | replace('-', '--') }}'/> {% elif src.type == 'zfs' %} - <source dev='/dev/zvol/{{ vm_host_cooked.zfs[src.backend | default('default')].pool }}/{{ vm_host_cooked.zfs[src.backend | default('default')].name }}/{{ install_hostname }}/{{ src.name }}'/> + <source dev='/dev/zvol/{{ vm_host_cooked.zfs[src.backend | default('default')].pool }}/{{ vm_host_cooked.zfs[src.backend | default('default')].name }}/{{ inventory_hostname }}/{{ src.name }}'/> {% endif %} <target dev='{{ device }}' bus='scsi'/> </disk> |