From 0085933dabbe4d36e3e1bf0a5a7e1f09e5c3645c Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Fri, 19 Jan 2024 01:47:04 +0100
Subject: vm/guest: some fixes for ubuntu installer, still not fully working

---
 roles/vm/guest/install/tasks/main.yml | 13 ++++++++-----
 1 file changed, 8 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 6a61b787..0cb7b925 100644
--- a/roles/vm/guest/install/tasks/main.yml
+++ b/roles/vm/guest/install/tasks/main.yml
@@ -39,17 +39,20 @@
       path: "{{ hostvars[vm_host.name].installer_base_path }}/"
       prefix: ".{{ inventory_hostname }}."
       state: directory
-    register: tmpdir
+    register: vm_install_tmpdir
 
-  - when: install_distro in ['debian', 'ubuntu', 'kali']
+  - when: install_distro in ['debian', 'kali']
     include_tasks: installer-debian.yml
 
+  - when: install_distro in ['ubuntu']
+    include_tasks: installer-ubuntu.yml
+
   - when: install_distro in ['openbsd']
     include_tasks: installer-openbsd.yml
 
   - name: Make installer workdir readable by qemu
     acl:
-      path: "{{ tmpdir.path }}"
+      path: "{{ vm_install_tmpdir.path }}"
       state: present
       entity: libvirt-qemu
       etype: user
@@ -64,7 +67,7 @@
   - name: define temporary installer vm
     vars:
       vm_create_installer: yes
-      installer_tmpdir: "{{ tmpdir.path }}"
+      installer_tmpdir: "{{ vm_install_tmpdir.path }}"
     import_role:
       name: vm/guest/create
 
@@ -91,7 +94,7 @@
   always:
   - name: cleanup temporary workdir
     file:
-      path: "{{ tmpdir.path }}"
+      path: "{{ vm_install_tmpdir.path }}"
       state: absent
 
 - name: remove temporary installer vm
-- 
cgit v1.2.3