From 48d0df39753037b6688c55a372254ef9ecae5631 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Sat, 21 Nov 2020 04:44:34 +0100
Subject: don't use install_hostname variable in roles

---
 roles/vm/guest/define/templates/libvirt-domain.xml.j2 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'roles/vm/guest/define/templates/libvirt-domain.xml.j2')

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>
-- 
cgit v1.2.3