From ed7afca113327383f1a0bd0435d7f859a45011de Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Sat, 11 Jul 2020 00:46:48 +0200
Subject: installer: cleanup variables

---
 roles/vm/install/tasks/main.yml | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

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

diff --git a/roles/vm/install/tasks/main.yml b/roles/vm/install/tasks/main.yml
index 7f102beb..a4511459 100644
--- a/roles/vm/install/tasks/main.yml
+++ b/roles/vm/install/tasks/main.yml
@@ -1,6 +1,6 @@
 ---
 - name: create lvm-based disks for vm
-  loop: "{{ hostvars[install_hostname].install_cooked.disks.virtio | default({}) | combine(hostvars[install_hostname].install_cooked.disks.scsi | default({})) | dict2items  | selectattr('value.type', 'eq', 'lvm') | list }}"
+  loop: "{{ hostvars[install_hostname].install_cooked.disks.virtio | default({}) | combine(hostvars[install_hostname].install_cooked.disks.scsi | default({})) | dict2items | selectattr('value.type', 'eq', 'lvm') | list }}"
   loop_control:
     label: "{{ item.value.vg }} / {{ item.value.lv }}  ({{ item.value.size }})"
   lvol:
@@ -31,6 +31,8 @@
 - block:
     - name: create a temporary workdir
       tempfile:
+        path: "{{ installer_base_path }}/"
+        prefix: ".{{ install_hostname }}."
         state: directory
       register: tmpdir
 
@@ -48,11 +50,11 @@
         etype: user
         permissions: rx
 
-    - import_role:
-        name: vm/define
-      vars:
+    - vars:
         vm_define_installer: yes
-        preseed_tmpdir: "{{ tmpdir.path }}"
+        installer_tmpdir: "{{ tmpdir.path }}"
+      import_role:
+        name: vm/define
 
     - debug:
         msg: "you can check on the status of the installer running this command 'virsh console {{ install_hostname }}' on host {{ inventory_hostname }}."
@@ -80,7 +82,7 @@
         path: "{{ tmpdir.path }}"
         state: absent
 
-- import_role:
-    name: vm/define
-  vars:
+- vars:
     vm_define_installer: no
+  import_role:
+    name: vm/define
-- 
cgit v1.2.3