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/install/tasks/main.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'roles/vm/guest/install/tasks/main.yml')

diff --git a/roles/vm/guest/install/tasks/main.yml b/roles/vm/guest/install/tasks/main.yml
index 0172c5bb..32bd9b7b 100644
--- a/roles/vm/guest/install/tasks/main.yml
+++ b/roles/vm/guest/install/tasks/main.yml
@@ -14,7 +14,7 @@
   loop: "{{ install_cooked.disks.virtio | default({}) | combine(install_cooked.disks.scsi | default({})) | dict2items | selectattr('value.type', 'eq', 'zfs') | map(attribute='value.backend') | map('default', 'default') | unique | list }}"
   delegate_to: "{{ vm_host_cooked.name }}"
   zfs:
-    name: "{{ vm_host_cooked.zfs[item].pool }}/{{ vm_host_cooked.zfs[item].name }}/{{ install_hostname }}"
+    name: "{{ vm_host_cooked.zfs[item].pool }}/{{ vm_host_cooked.zfs[item].name }}/{{ inventory_hostname }}"
     state: present
     extra_zfs_properties:
       canmount: no
@@ -26,7 +26,7 @@
     label: "{{ item.value.name }} on backend {{ item.value.backend | default('default') }} ({{ item.value.size }})"
   delegate_to: "{{ vm_host_cooked.name }}"
   zfs:
-    name: "{{ vm_host_cooked.zfs[item.value.backend | default('default')].pool }}/{{ vm_host_cooked.zfs[item.value.backend | default('default')].name }}/{{ install_hostname }}/{{ item.value.name }}"
+    name: "{{ vm_host_cooked.zfs[item.value.backend | default('default')].pool }}/{{ vm_host_cooked.zfs[item.value.backend | default('default')].name }}/{{ inventory_hostname }}/{{ item.value.name }}"
     state: present
     extra_zfs_properties: "{{ item.value.properties | default({}) | combine({'volsize': item.value.size}) }}"
 
@@ -36,7 +36,7 @@
   - name: create a temporary workdir
     tempfile:
       path: "{{ hostvars[vm_host_cooked.name].installer_base_path }}/"
-      prefix: ".{{ install_hostname }}."
+      prefix: ".{{ inventory_hostname }}."
       state: directory
     register: tmpdir
 
@@ -62,7 +62,7 @@
       name: vm/guest/define
 
   - debug:
-      msg: "you can check on the status of the installer running this command 'virsh console {{ install_hostname }}' on host {{ vm_host_cooked.name }}."
+      msg: "you can check on the status of the installer running this command 'virsh console {{ inventory_hostname }}' on host {{ vm_host_cooked.name }}."
 
   - when: installer_manual_steps_msg is defined
     pause:
@@ -75,7 +75,7 @@
 
   - name: wait for installer to finish or crash
     wait_for_virt:
-      name: "{{ install_hostname }}"
+      name: "{{ inventory_hostname }}"
       states: shutdown,crashed
       timeout: 1800
     register: installer_result
-- 
cgit v1.2.3