installer: cleanup variables

6 files changed, 12 insertions, 12 deletions

diff --git a/roles/installer/debian/preseed/defaults/main.yml b/roles/installer/debian/preseed/defaults/main.yml
index cfdef902..b5aad35c 100644
--- a/roles/installer/debian/preseed/defaults/main.yml
+++ b/roles/installer/debian/preseed/defaults/main.yml
@@ -1,7 +1,8 @@
 ---
-#preseed_tmpdir:
+# preseed_orig_initrd
+# preseed_tmpdir:
 
-#preseed_force_net_ifnames_policy: path
+# preseed_force_net_ifnames_policy: path
 preseed_no_netplan: no
 
 preseed_virtual_machine: no
diff --git a/roles/installer/debian/preseed/tasks/main.yml b/roles/installer/debian/preseed/tasks/main.yml
index f0dc56cd..2d229aa8 100644
--- a/roles/installer/debian/preseed/tasks/main.yml
+++ b/roles/installer/debian/preseed/tasks/main.yml
@@ -2,8 +2,8 @@
 - name: Copy initramfs into position
   copy:
     remote_src: yes
-    src: "{{ installer_base_path | mandatory }}/{{ install_distro }}-{{ install_codename }}/{{ hostvars[install_hostname].install_cooked.arch | default('amd64') }}-{{ debian_installer_variant }}/initrd.gz"
-    dest: "{{ preseed_tmpdir }}/initrd.preseed.gz"
+    src: "{{ preseed_orig_initrd }}"
+    dest: "{{ preseed_tmpdir }}/initrd.{{ install_hostname }}.gz"
 
 - name: Generate preseed file
   template:
@@ -42,7 +42,7 @@
         NamePolicy={{ preseed_force_net_ifnames_policy }}
 
 - name: Inject files into initramfs
-  shell: cpio -H newc -o | gzip -9 >> 'initrd.preseed.gz'
+  shell: cpio -H newc -o | gzip -9 >> 'initrd.{{ install_hostname }}.gz'
   args:
     chdir: "{{ preseed_tmpdir }}"
     stdin: |
diff --git a/roles/installer/debian/usb/tasks/main.yml b/roles/installer/debian/usb/tasks/main.yml
index 478e0d33..44f793e9 100644
--- a/roles/installer/debian/usb/tasks/main.yml
+++ b/roles/installer/debian/usb/tasks/main.yml
@@ -32,7 +32,7 @@
 
   - name: Copy the preseed initramfs to the usb drive
     copy:
-      src: "{{ tmpdir.path }}/initrd.preseed.gz"
+      src: "{{ tmpdir.path }}/initrd.{{ install_hostname }}.gz"
       dest: "{{ usb_install_path }}/initrd.{{ install_hostname }}.gz"
 
   always:
diff --git a/roles/installer/openbsd/autoinstall/defaults/main.yml b/roles/installer/openbsd/autoinstall/defaults/main.yml
index 27f7221a..b166c191 100644
--- a/roles/installer/openbsd/autoinstall/defaults/main.yml
+++ b/roles/installer/openbsd/autoinstall/defaults/main.yml
@@ -1,10 +1,7 @@
 ---
+# obsd_autoinstall_orig_iso:
 # obsd_autoinstall_tmpdir:
 
-obsd_autoinstall_arch: "{{ hostvars[install_hostname].install_cooked.arch | default('amd64') }}"
-obsd_autoinstall_version: "{{ install_codename }}"
-obsd_autoinstall_version_short: "{{ obsd_autoinstall_version | replace('.', '') }}"
-
 # obsd_autoinstall_serial_device: com0
 # obsd_autoinstall_serial_baudrate: 115200
 
diff --git a/roles/installer/openbsd/autoinstall/tasks/main.yml b/roles/installer/openbsd/autoinstall/tasks/main.yml
index 86f543ee..fc5f6194 100644
--- a/roles/installer/openbsd/autoinstall/tasks/main.yml
+++ b/roles/installer/openbsd/autoinstall/tasks/main.yml
@@ -29,7 +29,7 @@
       - "INSTALL.{{ obsd_autoinstall_arch }}"
       - "{{ obsd_autoinstall_file_sets | product([obsd_autoinstall_version_short+'.tgz']) | map('join') | list }}"
   iso_extract:
-    image: "{{ installer_base_path }}/openbsd-{{ obsd_autoinstall_version }}/{{ obsd_autoinstall_arch }}/install{{ obsd_autoinstall_version | replace('.', '') }}.iso"
+    image: "{{ obsd_autoinstall_orig_iso }}"
     dest: "{{ obsd_autoinstall_tmpdir }}/files"
     files: "{{ [obsd_autoinstall_version+'/'+obsd_autoinstall_arch+'/'] | product(installer_files | flatten) | map('join') | list }}"
 
@@ -45,7 +45,7 @@
     dest: "{{ obsd_autoinstall_tmpdir }}/files/site{{ obsd_autoinstall_version_short }}.tgz"
 
 - name: generate host specific installer image
-  command: 'genisoimage -RTLldDN -o "install.iso" -no-emul-boot -b "cdbr" -c "boot.catalog" files/'
+  command: 'genisoimage -RTLldDN -o "{{ install_hostname }}.iso" -no-emul-boot -b "cdbr" -c "boot.catalog" files/'
   args:
     chdir: "{{ obsd_autoinstall_tmpdir }}/"
 
diff --git a/roles/installer/openbsd/autoinstall/vars/main.yml b/roles/installer/openbsd/autoinstall/vars/main.yml
new file mode 100644
index 00000000..c20909d1
--- /dev/null
+++ b/roles/installer/openbsd/autoinstall/vars/main.yml
@@ -0,0 +1,2 @@
+---
+obsd_autoinstall_version_short: "{{ obsd_autoinstall_version | replace('.', '') }}"