add support for openbsd installer in vm/define

4 files changed, 5 insertions, 9 deletions

diff --git a/roles/installer/debian/defaults/main.yml b/roles/installer/debian/defaults/main.yml
index b778e85b..8962e9ad 100644
--- a/roles/installer/debian/defaults/main.yml
+++ b/roles/installer/debian/defaults/main.yml
@@ -20,5 +20,3 @@ debian_installer_force_download: no
 debian_installer_url:
   debian: "https://debian.ffgraz.net/debian"
   ubuntu: "https://debian.ffgraz.net/ubuntu"
-
-debian_installer_path: "{{ installer_path }}"
diff --git a/roles/installer/debian/tasks/main.yml b/roles/installer/debian/tasks/main.yml
index 77228e91..92fac536 100644
--- a/roles/installer/debian/tasks/main.yml
+++ b/roles/installer/debian/tasks/main.yml
@@ -3,7 +3,7 @@
   loop_control:
     label: "{{ item.0.distro }}/{{ item.0.codename }} {{ item.1 }}"
   file:
-    name: "{{ debian_installer_path }}/{{ item.0.distro }}-{{ item.0.codename }}/{{ item.1 }}"
+    name: "{{ installer_path }}/{{ item.0.distro }}-{{ item.0.codename }}/{{ item.1 }}"
     state: directory
 
 - name: download installer kernel images
@@ -12,7 +12,7 @@
     label: "{{ item.0.distro }}/{{ item.0.codename }} {{ item.1 }}"
   get_url:
     url: "{{ debian_installer_url[item.0.distro] }}/dists/{{ item.0.codename }}/main/installer-{{ item.1 }}/current/images/netboot/{{ item.0.distro }}-installer/{{ item.1 }}/linux"
-    dest: "{{ debian_installer_path }}/{{ item.0.distro }}-{{ item.0.codename }}/{{ item.1 }}/linux"
+    dest: "{{ installer_path }}/{{ item.0.distro }}-{{ item.0.codename }}/{{ item.1 }}/linux"
     mode: 0644
     force: "{{ debian_installer_force_download }}"
 
@@ -22,6 +22,6 @@
     label: "{{ item.0.distro }}/{{ item.0.codename }} {{ item.1 }}"
   get_url:
     url: "{{ debian_installer_url[item.0.distro] }}/dists/{{ item.0.codename }}/main/installer-{{ item.1 }}/current/images/netboot/{{ item.0.distro }}-installer/{{ item.1 }}/initrd.gz"
-    dest: "{{ debian_installer_path }}/{{ item.0.distro }}-{{ item.0.codename }}/{{ item.1 }}/initrd.gz"
+    dest: "{{ installer_path }}/{{ item.0.distro }}-{{ item.0.codename }}/{{ item.1 }}/initrd.gz"
     mode: 0644
     force: "{{ debian_installer_force_download }}"
diff --git a/roles/installer/openbsd/defaults/main.yml b/roles/installer/openbsd/defaults/main.yml
index 4538646f..004b8ecc 100644
--- a/roles/installer/openbsd/defaults/main.yml
+++ b/roles/installer/openbsd/defaults/main.yml
@@ -6,5 +6,3 @@ openbsd_versions:
 
 openbsd_installer_force_download: no
 openbsd_installer_url: "https://cdn.openbsd.org/pub/OpenBSD/"
-
-openbsd_installer_path: "{{ installer_path }}"
diff --git a/roles/installer/openbsd/tasks/main.yml b/roles/installer/openbsd/tasks/main.yml
index 6aeba7ef..e7196258 100644
--- a/roles/installer/openbsd/tasks/main.yml
+++ b/roles/installer/openbsd/tasks/main.yml
@@ -3,7 +3,7 @@
   loop_control:
     label: "openbsd-{{ item.0.version }} {{ item.1 }}"
   file:
-    name: "{{ openbsd_installer_path }}/openbsd-{{ item.0.version }}/{{ item.1 }}"
+    name: "{{ installer_path }}/openbsd-{{ item.0.version }}/{{ item.1 }}"
     state: directory
 
 - name: download installer isos
@@ -12,6 +12,6 @@
     label: "openbsd-{{ item.0.version }} {{ item.1 }}"
   get_url:
     url: "{{ openbsd_installer_url }}/{{ item.0.version }}/{{ item.1 }}/install{{ item.0.version | replace('.', '') }}.iso"
-    dest: "{{ openbsd_installer_path }}/openbsd-{{ item.0.version }}/{{ item.1 }}/install.iso"
+    dest: "{{ installer_path }}/openbsd-{{ item.0.version }}/{{ item.1 }}/install.iso"
     mode: 0644
     force: "{{ openbsd_installer_force_download }}"