From e3d0be5df3a8a43b19da0bb814c8174048cfc79f Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Thu, 6 Jan 2022 19:22:14 +0100
Subject: split up vm/define into remove and create

---
 roles/vm/guest/install/tasks/main.yml | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

(limited to 'roles/vm/guest/install/tasks')

diff --git a/roles/vm/guest/install/tasks/main.yml b/roles/vm/guest/install/tasks/main.yml
index d4a31929..ab60d222 100644
--- a/roles/vm/guest/install/tasks/main.yml
+++ b/roles/vm/guest/install/tasks/main.yml
@@ -31,7 +31,8 @@
     extra_zfs_properties: "{{ item.value.properties | default({}) | combine({'volsize': item.value.size}) | dehumanize_zfs_properties }}"
 
 
-- delegate_to: "{{ vm_host.name }}"
+- name: run installer
+  delegate_to: "{{ vm_host.name }}"
   block:
   - name: create a temporary workdir
     tempfile:
@@ -41,10 +42,10 @@
     register: tmpdir
 
   - when: install_distro in ['debian', 'ubuntu']
-    import_tasks: installer-debian.yml
+    include_tasks: installer-debian.yml
 
   - when: install_distro in ['openbsd']
-    import_tasks: installer-openbsd.yml
+    include_tasks: installer-openbsd.yml
 
   - name: Make installer workdir readable by qemu
     acl:
@@ -54,12 +55,16 @@
       etype: user
       permissions: rx
 
-  - name: define installer vm
+  - name: remove vm if it already exists
+    import_role:
+      name: vm/guest/remove
+
+  - name: define temporary installer vm
     vars:
-      vm_define_installer: yes
+      vm_create_installer: yes
       installer_tmpdir: "{{ tmpdir.path }}"
     import_role:
-      name: vm/guest/define
+      name: vm/guest/create
 
   - debug:
       msg: "you can check on the status of the installer running this command 'virsh console {{ inventory_hostname }}' on host {{ vm_host.name }}."
@@ -87,9 +92,12 @@
       path: "{{ tmpdir.path }}"
       state: absent
 
+- name: remove temporary installer vm
+  import_role:
+    name: vm/guest/remove
+
 - name: define vm
   vars:
-    vm_define_installer: no
-  delegate_to: "{{ vm_host.name }}"
+    vm_create_installer: no
   import_role:
-    name: vm/guest/define
+    name: vm/guest/create
-- 
cgit v1.2.3