5 files changed, 41 insertions, 19 deletions
diff --git a/roles/vm/define/templates/libvirt-domain.xml.j2 b/roles/vm/define/templates/libvirt-domain.xml.j2
index c4c9e52a..5af12c00 100644
--- a/roles/vm/define/templates/libvirt-domain.xml.j2
+++ b/roles/vm/define/templates/libvirt-domain.xml.j2
@@ -7,7 +7,7 @@
     <type arch='x86_64' machine='pc-0.12'>hvm</type>
 {% if vm_define_installer %}
 {%   if install_distro == 'debian' or install_distro == 'ubuntu' %}
-    <kernel>{{ installer_path }}/{{ install_distro }}-{{ install_codename }}/{{ hostvars[install_hostname].install_cooked.arch | default('amd64') }}/linux</kernel>
+    <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>
     <cmdline>console=ttyS0,115200n8 DEBCONF_DEBUG=5</cmdline>
     <boot dev='hd'/>
diff --git a/roles/vm/host/tasks/main.yml b/roles/vm/host/tasks/main.yml
index 390016a2..4c29970d 100644
--- a/roles/vm/host/tasks/main.yml
+++ b/roles/vm/host/tasks/main.yml
@@ -43,11 +43,11 @@
   - name: mount filesytem
     mount:
       src: "/dev/mapper/{{ installer_lvm.vg | replace('-', '--') }}-{{ installer_lvm.lv | replace('-', '--') }}"
-      path: "{{ installer_path }}"
+      path: "{{ installer_base_path }}"
       fstype: "{{ installer_lvm.fs }}"
       state: mounted
 
 - name: make sure installer directory exists
   file:
-    name: "{{ installer_path }}"
+    name: "{{ installer_base_path }}"
     state: directory
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: