diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2024-04-27 02:26:23 +0200 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2024-04-27 02:26:23 +0200 |
| commit | 012046624239206f4989d64d6d2f2b68b71b805d (patch) | |
| tree | 412d453b1e18f12c4e2499b89a82ba297e1ba30b /common | |
| parent | initial support for ubuntu 24.04 (diff) | |
autoselection for installer_variant and some more ubunut noble fixes
Diffstat (limited to 'common')
| -rw-r--r-- | common/iso-generate.yml | 12 | ||||
| -rw-r--r-- | common/iso-install.yml | 14 | ||||
| -rw-r--r-- | common/usb-generate.yml | 12 | ||||
| -rw-r--r-- | common/usb-install.yml | 14 |
4 files changed, 26 insertions, 26 deletions
diff --git a/common/iso-generate.yml b/common/iso-generate.yml index 78047e13..d6a00ed7 100644 --- a/common/iso-generate.yml +++ b/common/iso-generate.yml @@ -3,9 +3,9 @@ hosts: "{{ install_hostnames }}" connection: local gather_facts: no - vars: - installer_variant: debian - roles: - - role: "installer/{{ installer_variant }}/iso" - installer_base_path: "{{ global_cache_dir }}/{{ installer_variant }}-installer" - installer_keyrings_path: "{{ global_files_dir }}/common/keyrings" + tasks: + - vars: + installer_base_path: "{{ global_cache_dir }}/{{ installer_variant }}-installer" + installer_keyrings_path: "{{ global_files_dir }}/common/keyrings" + include_role: + name: "installer/{{ installer_variant }}/iso" diff --git a/common/iso-install.yml b/common/iso-install.yml index 3088b107..779d917f 100644 --- a/common/iso-install.yml +++ b/common/iso-install.yml @@ -3,13 +3,13 @@ hosts: "{{ install_hostname }}" connection: local gather_facts: no - vars: - installer_variant: debian - roles: - - role: "installer/{{ installer_variant }}/iso" - installer_base_path: "{{ global_cache_dir }}/{{ installer_variant }}-installer" - installer_keyrings_path: "{{ global_files_dir }}/common/keyrings" - post_tasks: + tasks: + - vars: + installer_base_path: "{{ global_cache_dir }}/{{ installer_variant }}-installer" + installer_keyrings_path: "{{ global_files_dir }}/common/keyrings" + include_role: + name: "installer/{{ installer_variant }}/iso" + - set_fact: iso_install_image_path: "{{ iso_install_target_dir }}/{{ install_hostname }}.iso" diff --git a/common/usb-generate.yml b/common/usb-generate.yml index 7031839c..ffb780bb 100644 --- a/common/usb-generate.yml +++ b/common/usb-generate.yml @@ -3,13 +3,13 @@ hosts: "{{ install_hostnames }}" connection: local gather_facts: no - vars: - installer_variant: debian vars_prompt: - name: usb_install_path prompt: "Path to the the USB installation mountpoint or device" private: no - roles: - - role: "installer/{{ installer_variant }}/usb" - installer_base_path: "{{ global_cache_dir }}/{{ installer_variant }}-installer" - installer_keyrings_path: "{{ global_files_dir }}/common/keyrings" + tasks: + - vars: + installer_base_path: "{{ global_cache_dir }}/{{ installer_variant }}-installer" + installer_keyrings_path: "{{ global_files_dir }}/common/keyrings" + include_role: + name: "installer/{{ installer_variant }}/usb" diff --git a/common/usb-install.yml b/common/usb-install.yml index a909e679..fa901594 100644 --- a/common/usb-install.yml +++ b/common/usb-install.yml @@ -3,17 +3,17 @@ hosts: "{{ install_hostname }}" connection: local gather_facts: no - vars: - installer_variant: debian vars_prompt: - name: usb_install_path prompt: "Path to the the USB installation mountpoint or device" private: no - roles: - - role: "installer/{{ installer_variant }}/usb" - installer_base_path: "{{ global_cache_dir }}/{{ installer_variant }}-installer" - installer_keyrings_path: "{{ global_files_dir }}/common/keyrings" - post_tasks: + tasks: + - vars: + installer_base_path: "{{ global_cache_dir }}/{{ installer_variant }}-installer" + installer_keyrings_path: "{{ global_files_dir }}/common/keyrings" + include_role: + name: "installer/{{ installer_variant }}/usb" + - pause: prompt: | Please unmount the USB the stick, plug it into the machine and boot from it. |