From 85f91135e58106b838083bd8a96734be6abafad1 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Thu, 26 Dec 2019 18:38:37 +0100
Subject: make vm install work for both debian/ubuntu and openbsd

---
 roles/vm/install/tasks/main.yml | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

(limited to 'roles/vm/install/tasks/main.yml')

diff --git a/roles/vm/install/tasks/main.yml b/roles/vm/install/tasks/main.yml
index bc31967a..20484401 100644
--- a/roles/vm/install/tasks/main.yml
+++ b/roles/vm/install/tasks/main.yml
@@ -28,22 +28,24 @@
         state: directory
       register: tmpdir
 
-    # - import_role:
-    #     name: installer/debian/preseed
-    #   vars:
-    #     ssh_keys_root: "{{ hostvars[hostname].ssh_keys_root }}"
-    #     preseed_tmpdir: "{{ tmpdir.path }}"
-    #     preseed_force_net_ifnames_policy: path
-    #     preseed_no_netplan: yes
-    #     install_interface: enp1s1
+    - when: install_distro in ['debian', 'ubuntu']
+      vars:
+        ssh_keys_root: "{{ hostvars[hostname].ssh_keys_root }}"
+        preseed_tmpdir: "{{ tmpdir.path }}"
+        preseed_force_net_ifnames_policy: path
+        preseed_no_netplan: yes
+        install_interface: enp1s1
+      import_role:
+        name: installer/debian/preseed
 
-    - import_role:
-        name: installer/openbsd/autoinstall
+    - when: install_distro in ['openbsd']
       vars:
         ssh_keys_root: "{{ hostvars[hostname].ssh_keys_root }}"
         obsd_autoinstall_tmpdir: "{{ tmpdir.path }}"
         obsd_autoinstall_serial_device: com0
         install_interface: vio0
+      import_role:
+        name: installer/openbsd/autoinstall
 
     - name: Make installer workdir readable by qemu
       acl:
-- 
cgit v1.2.3