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/define/templates/libvirt-domain.xml.j2 |  4 ++--
 roles/vm/install/tasks/installer-debian.yml     |  3 ++-
 roles/vm/install/tasks/installer-openbsd.yml    |  5 ++++-
 roles/vm/install/tasks/main.yml                 | 18 ++++++++++--------
 4 files changed, 18 insertions(+), 12 deletions(-)

(limited to 'roles/vm')

diff --git a/roles/vm/define/templates/libvirt-domain.xml.j2 b/roles/vm/define/templates/libvirt-domain.xml.j2
index 5af12c00..ba0dcd5a 100644
--- a/roles/vm/define/templates/libvirt-domain.xml.j2
+++ b/roles/vm/define/templates/libvirt-domain.xml.j2
@@ -8,7 +8,7 @@
 {% if vm_define_installer %}
 {%   if install_distro == 'debian' or install_distro == 'ubuntu' %}
     <kernel>{{ installer_base_path }}/{{ install_distro }}-{{ install_codename }}/{{ hostvars[install_hostname].install_cooked.arch | default('amd64') }}-netboot/linux</kernel>
-    <initrd>{{ preseed_tmpdir }}/initrd.preseed.gz</initrd>
+    <initrd>{{ installer_tmpdir }}/initrd.{{ install_hostname }}.gz</initrd>
     <cmdline>console=ttyS0,115200n8 DEBCONF_DEBUG=5</cmdline>
     <boot dev='hd'/>
 {%   elif install_distro == 'openbsd' %}
@@ -44,7 +44,7 @@
 {% if vm_define_installer and install_distro == 'openbsd' %}
     <disk type='file' device='cdrom'>
       <driver name='qemu'/>
-      <source file='{{ obsd_autoinstall_tmpdir }}/install.iso'/>
+      <source file='{{ installer_tmpdir }}/{{ install_hostname }}.iso'/>
       <target dev='hdc' bus='ide'/>
       <readonly/>
     </disk>
diff --git a/roles/vm/install/tasks/installer-debian.yml b/roles/vm/install/tasks/installer-debian.yml
index 29aae48f..e0492969 100644
--- a/roles/vm/install/tasks/installer-debian.yml
+++ b/roles/vm/install/tasks/installer-debian.yml
@@ -3,7 +3,7 @@
   vars:
     debian_installer_distro: "{{ install_distro }}"
     debian_installer_codename: "{{ install_codename }}"
-    debian_installer_arch: "{{ install_cooked.arch | default('amd64') }}"
+    debian_installer_arch: "{{ hostvars[install_hostname].install_cooked.arch | default('amd64') }}"
     debian_installer_variant: netboot
   import_role:
     name: installer/debian/fetch
@@ -11,6 +11,7 @@
 - name: generate host specific initial ramdisk
   vars:
     ssh_keys_root: "{{ hostvars[install_hostname].ssh_keys_root }}"
+    preseed_orig_initrd: "{{ installer_base_path }}/{{ install_distro }}-{{ install_codename }}/{{ hostvars[install_hostname].install_cooked.arch | default('amd64') }}-netboot/initrd.gz"
     preseed_tmpdir: "{{ tmpdir.path }}"
     preseed_virtual_machine: yes
     preseed_force_net_ifnames_policy: path
diff --git a/roles/vm/install/tasks/installer-openbsd.yml b/roles/vm/install/tasks/installer-openbsd.yml
index f3802afd..afa17c45 100644
--- a/roles/vm/install/tasks/installer-openbsd.yml
+++ b/roles/vm/install/tasks/installer-openbsd.yml
@@ -2,14 +2,17 @@
 - name: fetch openbsd installer files
   vars:
     openbsd_installer_version: "{{ install_codename }}"
-    openbsd_installer_arch: "{{ install_cooked.arch | default('amd64') }}"
+    openbsd_installer_arch: "{{ hostvars[install_hostname].install_cooked.arch | default('amd64') }}"
   import_role:
     name: installer/openbsd/fetch
 
 - name: generate host specific autoinstall iso
   vars:
     ssh_keys_root: "{{ hostvars[install_hostname].ssh_keys_root }}"
+    obsd_autoinstall_orig_iso: "{{ installer_base_path }}/openbsd-{{ install_codename }}/{{ hostvars[install_hostname].install_cooked.arch | default('amd64') }}/install{{ openbsd_installer_version_short }}.iso"
     obsd_autoinstall_tmpdir: "{{ tmpdir.path }}"
+    obsd_autoinstall_version: "{{ install_codename }}"
+    obsd_autoinstall_arch: "{{ hostvars[install_hostname].install_cooked.arch | default('amd64') }}"
     obsd_autoinstall_serial_device: com0
     install_interface: vio0
   import_role:
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