diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2021-07-01 13:23:12 +0200 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2021-07-01 13:23:12 +0200 |
| commit | c05e1ca70925e9e68788718f05fca0f13a13bb44 (patch) | |
| tree | 32669010087880ad8a7ca3adc31dc9dc27fb4d61 /common | |
| parent | use nopersistent kernel command line at ubunut/iso installer as well (diff) | |
make new ubuntu-installer selectable by (usb|iso)-install.yml playbooks
Diffstat (limited to 'common')
| -rw-r--r-- | common/iso-install.yml | 21 | ||||
| -rw-r--r-- | common/usb-install.yml | 24 |
2 files changed, 25 insertions, 20 deletions
diff --git a/common/iso-install.yml b/common/iso-install.yml index ea132d4e..810761d2 100644 --- a/common/iso-install.yml +++ b/common/iso-install.yml @@ -1,26 +1,23 @@ --- -- name: preparations and sanity checks +- name: preparations, sanity checks and basic installation hosts: "{{ install_hostname }}" connection: local gather_facts: no + vars: + installer_variant: debian roles: - - role: installer/debian/iso - installer_base_path: "{{ global_cache_dir }}/debian-installer" + - role: "installer/{{ installer_variant }}/iso" + installer_base_path: "{{ global_cache_dir }}/{{ installer_variant }}-installer" installer_keyrings_path: "{{ global_files_dir }}/common/keyrings" post_tasks: - set_fact: iso_install_image_path: "{{ iso_install_target_dir }}/{{ install_hostname }}.iso" - -- name: basic installation - hosts: "{{ install_hostname }}" - gather_facts: no - tasks: - pause: prompt: | The generated image can be found at: - {{ iso_install_image_path }} + {{ iso_install_image_path | realpath }} Please load the image into the machine and boot from it. {% if install_distro == "debian" and install_cooked.efi is defined and install_cooked.efi %} @@ -33,6 +30,12 @@ {% endif %} Once the installation is done press ENTER to continue or CTRL-C then A to abort. + {% if installer_variant == 'ubuntu' %} + + Hint: You are using the ubuntu installer, this means the final system initialization and + cleanup is done by cloud-init on first boot. These steps need to be finished before the + playbook can continue. + {% endif %} - name: wait for new machine to start up, apply early roles and reboot diff --git a/common/usb-install.yml b/common/usb-install.yml index 81fe239a..a7bbe012 100644 --- a/common/usb-install.yml +++ b/common/usb-install.yml @@ -1,28 +1,30 @@ --- -- name: preparations and sanity checks +- name: preparations, sanity checks and basic installation hosts: "{{ install_hostname }}" connection: local gather_facts: no + vars: + installer_variant: debian vars_prompt: - name: usb_install_path - prompt: Where is the USB installation medium mounted to? + prompt: "Path to the the USB installation mountpoint or device" private: no - roles: - - role: installer/debian/usb - installer_base_path: "{{ global_cache_dir }}/debian-installer" + - role: "installer/{{ installer_variant }}/usb" + installer_base_path: "{{ global_cache_dir }}/{{ installer_variant }}-installer" installer_keyrings_path: "{{ global_files_dir }}/common/keyrings" - - -- name: basic installation - hosts: "{{ install_hostname }}" - gather_facts: no - tasks: + post_tasks: - pause: prompt: | Please unmount the USB the stick, plug it into the machine and boot from it. Once the installation is done press ENTER to continue or CTRL-C then A to abort. + {% if installer_variant == 'ubuntu' %} + + Hint: You are using the ubuntu installer, this means the final system initialization and + cleanup is done by cloud-init on first boot. These steps need to be finished before the + playbook can continue. + {% endif %} - name: wait for new machine to start up, apply early roles and reboot |