major refactoring of installer roles

3 files changed, 38 insertions, 16 deletions

diff --git a/roles/vm/install/tasks/installer-debian.yml b/roles/vm/install/tasks/installer-debian.yml
new file mode 100644
index 00000000..29aae48f
--- /dev/null
+++ b/roles/vm/install/tasks/installer-debian.yml
@@ -0,0 +1,20 @@
+---
+- name: fetch debian installer files
+  vars:
+    debian_installer_distro: "{{ install_distro }}"
+    debian_installer_codename: "{{ install_codename }}"
+    debian_installer_arch: "{{ install_cooked.arch | default('amd64') }}"
+    debian_installer_variant: netboot
+  import_role:
+    name: installer/debian/fetch
+
+- name: generate host specific initial ramdisk
+  vars:
+    ssh_keys_root: "{{ hostvars[install_hostname].ssh_keys_root }}"
+    preseed_tmpdir: "{{ tmpdir.path }}"
+    preseed_virtual_machine: yes
+    preseed_force_net_ifnames_policy: path
+    preseed_no_netplan: yes
+    install_interface: enp1s1
+  import_role:
+    name: installer/debian/preseed
diff --git a/roles/vm/install/tasks/installer-openbsd.yml b/roles/vm/install/tasks/installer-openbsd.yml
new file mode 100644
index 00000000..f3802afd
--- /dev/null
+++ b/roles/vm/install/tasks/installer-openbsd.yml
@@ -0,0 +1,16 @@
+---
+- name: fetch openbsd installer files
+  vars:
+    openbsd_installer_version: "{{ install_codename }}"
+    openbsd_installer_arch: "{{ 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_tmpdir: "{{ tmpdir.path }}"
+    obsd_autoinstall_serial_device: com0
+    install_interface: vio0
+  import_role:
+    name: installer/openbsd/autoinstall
diff --git a/roles/vm/install/tasks/main.yml b/roles/vm/install/tasks/main.yml
index 6b8f9ca7..7f102beb 100644
--- a/roles/vm/install/tasks/main.yml
+++ b/roles/vm/install/tasks/main.yml
@@ -35,24 +35,10 @@
       register: tmpdir
 
     - when: install_distro in ['debian', 'ubuntu']
-      vars:
-        ssh_keys_root: "{{ hostvars[install_hostname].ssh_keys_root }}"
-        preseed_tmpdir: "{{ tmpdir.path }}"
-        preseed_virtual_machine: yes
-        preseed_force_net_ifnames_policy: path
-        preseed_no_netplan: yes
-        install_interface: enp1s1
-      import_role:
-        name: installer/debian/preseed
+      import_tasks: installer-debian.yml
 
     - when: install_distro in ['openbsd']
-      vars:
-        ssh_keys_root: "{{ hostvars[install_hostname].ssh_keys_root }}"
-        obsd_autoinstall_tmpdir: "{{ tmpdir.path }}"
-        obsd_autoinstall_serial_device: com0
-        install_interface: vio0
-      import_role:
-        name: installer/openbsd/autoinstall
+      import_tasks: installer-openbsd.yml
 
     - name: Make installer workdir readable by qemu
       acl: