diff options
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/vm/install/meta/main.yml | 7 | ||||
| -rw-r--r-- | roles/vm/install/tasks/main.yml | 22 |
2 files changed, 12 insertions, 17 deletions
diff --git a/roles/vm/install/meta/main.yml b/roles/vm/install/meta/main.yml deleted file mode 100644 index 34c068b6..00000000 --- a/roles/vm/install/meta/main.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -# dependencies: -# - role: installer/debian/base -# distros: -# - distro: "{{ install_distro }}" -# codename: "{{ install_codename }}" -# arch: [ "{{ hostvars[hostname].install_cooked.arch | default('amd64') }}" ] 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: |