diff options
Diffstat (limited to 'roles/installer')
11 files changed, 82 insertions, 158 deletions
diff --git a/roles/installer/debian/iso/templates/isolinux.cfg.j2 b/roles/installer/debian/iso/templates/isolinux.cfg.j2 index c7bf1246..0a6555c2 100644 --- a/roles/installer/debian/iso/templates/isolinux.cfg.j2 +++ b/roles/installer/debian/iso/templates/isolinux.cfg.j2 @@ -12,4 +12,4 @@ SAY ** LABEL {{ install_hostname }} KERNEL linux INITRD initrd.gz - APPEND auto=true fb=false {{ (hostvars[install_hostname].install_cooked.kernel_cmdline | default([])) | join(' ') }} + APPEND auto fb=false {{ (hostvars[install_hostname].install_cooked.kernel_cmdline | default([])) | join(' ') }} diff --git a/roles/installer/debian/preseed/defaults/main.yml b/roles/installer/debian/preseed/defaults/main.yml index 2ad4e32a..5b7bea07 100644 --- a/roles/installer/debian/preseed/defaults/main.yml +++ b/roles/installer/debian/preseed/defaults/main.yml @@ -2,6 +2,16 @@ # preseed_initrd # preseed_tmpdir: +preseed_language: en +preseed_country: US +preseed_locales: + - en_US.UTF-8 + +preseed_keyboard_layout: de +preseed_keyboard_variant: nodeadkeys + +preseed_timezone: Europe/Vienna + # preseed_force_net_ifnames_policy: path preseed_no_netplan: no diff --git a/roles/installer/debian/preseed/templates/preseed_debian-bullseye.cfg.j2 b/roles/installer/debian/preseed/templates/preseed_debian-bullseye.cfg.j2 index d02ab496..04ccfcb4 100644 --- a/roles/installer/debian/preseed/templates/preseed_debian-bullseye.cfg.j2 +++ b/roles/installer/debian/preseed/templates/preseed_debian-bullseye.cfg.j2 @@ -2,10 +2,15 @@ # spreadspace preseed file for Debian bullseye based machines ######################################################################### -d-i debian-installer/language string en -d-i debian-installer/country string AT -d-i debian-installer/locale string en_US.UTF-8 -d-i keyboard-configuration/xkb-keymap select us +d-i debian-installer/language string {{ preseed_language }} +d-i debian-installer/country string {{ preseed_country }} +d-i debian-installer/locale string {{ preseed_locales | first }} +d-i localechooser/preferred-locale string {{ preseed_locales | first }} +d-i localechooser/supported-locales multiselect {{ preseed_locales | join(', ') }} + +d-i keyboard-configuration/xkb-keymap select {{ preseed_keyboard_layout }} +d-i keyboard-configuration/layoutcode string {{ preseed_keyboard_layout }} +d-i keyboard-configuration/variantcode string {{ preseed_keyboard_variant }} d-i hw-detect/load_firmware boolean false @@ -42,7 +47,7 @@ d-i passwd/root-password-again password this-very-very-secure-password-will-be-r d-i clock-setup/utc boolean true -d-i time/zone string Europe/Vienna +d-i time/zone string {{ preseed_timezone }} d-i clock-setup/ntp boolean false diff --git a/roles/installer/debian/preseed/templates/preseed_debian-buster.cfg.j2 b/roles/installer/debian/preseed/templates/preseed_debian-buster.cfg.j2 index fa70d2b9..77671947 100644 --- a/roles/installer/debian/preseed/templates/preseed_debian-buster.cfg.j2 +++ b/roles/installer/debian/preseed/templates/preseed_debian-buster.cfg.j2 @@ -2,10 +2,15 @@ # spreadspace preseed file for Debian buster based machines ######################################################################### -d-i debian-installer/language string en -d-i debian-installer/country string AT -d-i debian-installer/locale string en_US.UTF-8 -d-i keyboard-configuration/xkb-keymap select us +d-i debian-installer/language string {{ preseed_language }} +d-i debian-installer/country string {{ preseed_country }} +d-i debian-installer/locale string {{ preseed_locales | first }} +d-i localechooser/preferred-locale string {{ preseed_locales | first }} +d-i localechooser/supported-locales multiselect {{ preseed_locales | join(', ') }} + +d-i keyboard-configuration/xkb-keymap select {{ preseed_keyboard_layout }} +d-i keyboard-configuration/layoutcode string {{ preseed_keyboard_layout }} +d-i keyboard-configuration/variantcode string {{ preseed_keyboard_variant }} d-i hw-detect/load_firmware boolean false @@ -42,7 +47,7 @@ d-i passwd/root-password-again password this-very-very-secure-password-will-be-r d-i clock-setup/utc boolean true -d-i time/zone string Europe/Vienna +d-i time/zone string {{ preseed_timezone }} d-i clock-setup/ntp boolean false diff --git a/roles/installer/debian/preseed/templates/preseed_debian-jessie.cfg.j2 b/roles/installer/debian/preseed/templates/preseed_debian-jessie.cfg.j2 index d033b3b0..02379c16 100644 --- a/roles/installer/debian/preseed/templates/preseed_debian-jessie.cfg.j2 +++ b/roles/installer/debian/preseed/templates/preseed_debian-jessie.cfg.j2 @@ -2,10 +2,15 @@ # spreadspace preseed file for Debian jessie based machines ######################################################################### -d-i debian-installer/language string en -d-i debian-installer/country string AT -d-i debian-installer/locale string en_US.UTF-8 -d-i keyboard-configuration/xkb-keymap select us +d-i debian-installer/language string {{ preseed_language }} +d-i debian-installer/country string {{ preseed_country }} +d-i debian-installer/locale string {{ preseed_locales | first }} +d-i localechooser/preferred-locale string {{ preseed_locales | first }} +d-i localechooser/supported-locales multiselect {{ preseed_locales | join(', ') }} + +d-i keyboard-configuration/xkb-keymap select {{ preseed_keyboard_layout }} +d-i keyboard-configuration/layoutcode string {{ preseed_keyboard_layout }} +d-i keyboard-configuration/variantcode string {{ preseed_keyboard_variant }} d-i hw-detect/load_firmware boolean false @@ -42,7 +47,7 @@ d-i passwd/root-password-again password this-very-very-secure-password-will-be-r d-i clock-setup/utc boolean true -d-i time/zone string Europe/Vienna +d-i time/zone string {{ preseed_timezone }} d-i clock-setup/ntp boolean false diff --git a/roles/installer/debian/preseed/templates/preseed_debian-stretch.cfg.j2 b/roles/installer/debian/preseed/templates/preseed_debian-stretch.cfg.j2 index 0528f33c..01108f09 100644 --- a/roles/installer/debian/preseed/templates/preseed_debian-stretch.cfg.j2 +++ b/roles/installer/debian/preseed/templates/preseed_debian-stretch.cfg.j2 @@ -2,10 +2,15 @@ # spreadspace preseed file for Debian stretch based machines ######################################################################### -d-i debian-installer/language string en -d-i debian-installer/country string AT -d-i debian-installer/locale string en_US.UTF-8 -d-i keyboard-configuration/xkb-keymap select us +d-i debian-installer/language string {{ preseed_language }} +d-i debian-installer/country string {{ preseed_country }} +d-i debian-installer/locale string {{ preseed_locales | first }} +d-i localechooser/preferred-locale string {{ preseed_locales | first }} +d-i localechooser/supported-locales multiselect {{ preseed_locales | join(', ') }} + +d-i keyboard-configuration/xkb-keymap select {{ preseed_keyboard_layout }} +d-i keyboard-configuration/layoutcode string {{ preseed_keyboard_layout }} +d-i keyboard-configuration/variantcode string {{ preseed_keyboard_variant }} d-i hw-detect/load_firmware boolean false @@ -42,7 +47,7 @@ d-i passwd/root-password-again password this-very-very-secure-password-will-be-r d-i clock-setup/utc boolean true -d-i time/zone string Europe/Vienna +d-i time/zone string {{ preseed_timezone }} d-i clock-setup/ntp boolean false diff --git a/roles/installer/debian/preseed/templates/preseed_ubuntu-bionic.cfg.j2 b/roles/installer/debian/preseed/templates/preseed_ubuntu-bionic.cfg.j2 index 61f08552..503d09c4 100644 --- a/roles/installer/debian/preseed/templates/preseed_ubuntu-bionic.cfg.j2 +++ b/roles/installer/debian/preseed/templates/preseed_ubuntu-bionic.cfg.j2 @@ -2,14 +2,16 @@ # spreadspace preseed file for Ubuntu bionic based machines ######################################################################### -d-i debian-installer/language string en -d-i debian-installer/country string AT -d-i debian-installer/locale string en_US.UTF-8 -d-i localechooser/preferred-locale string en_US.UTF-8 -d-i localechooser/supported-locales multiselect de_DE.UTF-8, de_AT.UTF-8 +d-i debian-installer/language string {{ preseed_language }} +d-i debian-installer/country string {{ preseed_country }} +d-i debian-installer/locale string {{ preseed_locales | first }} +d-i localechooser/preferred-locale string {{ preseed_locales | first }} +d-i localechooser/supported-locales multiselect {{ preseed_locales | join(', ') }} +d-i localechooser/translation/warn-light boolean true + d-i console-setup/ask_detect boolean false -d-i keyboard-configuration/xkb-keymap select us -d-i keyboard-configuration/layoutcode string us +d-i keyboard-configuration/layoutcode string {{ preseed_keyboard_layout }} +d-i keyboard-configuration/variantcode string {{ preseed_keyboard_variant }} d-i hw-detect/load_firmware boolean false @@ -50,7 +52,7 @@ d-i passwd/root-password-again password this-very-very-secure-password-will-be-r d-i clock-setup/utc boolean true -d-i time/zone string Europe/Vienna +d-i time/zone string {{ preseed_timezone }} d-i clock-setup/ntp boolean false diff --git a/roles/installer/debian/preseed/templates/preseed_ubuntu-focal.cfg.j2 b/roles/installer/debian/preseed/templates/preseed_ubuntu-focal.cfg.j2 index 76f6a045..64fad668 100644 --- a/roles/installer/debian/preseed/templates/preseed_ubuntu-focal.cfg.j2 +++ b/roles/installer/debian/preseed/templates/preseed_ubuntu-focal.cfg.j2 @@ -2,14 +2,16 @@ # spreadspace preseed file for Ubuntu focal based machines ######################################################################### -d-i debian-installer/language string en -d-i debian-installer/country string AT -d-i debian-installer/locale string en_US.UTF-8 -d-i localechooser/preferred-locale string en_US.UTF-8 -d-i localechooser/supported-locales multiselect de_DE.UTF-8, de_AT.UTF-8 +d-i debian-installer/language string {{ preseed_language }} +d-i debian-installer/country string {{ preseed_country }} +d-i debian-installer/locale string {{ preseed_locales | first }} +d-i localechooser/preferred-locale string {{ preseed_locales | first }} +d-i localechooser/supported-locales multiselect {{ preseed_locales | join(', ') }} +d-i localechooser/translation/warn-light boolean true + d-i console-setup/ask_detect boolean false -d-i keyboard-configuration/xkb-keymap select us -d-i keyboard-configuration/layoutcode string us +d-i keyboard-configuration/layoutcode string {{ preseed_keyboard_layout }} +d-i keyboard-configuration/variantcode string {{ preseed_keyboard_variant }} d-i hw-detect/load_firmware boolean false @@ -50,7 +52,7 @@ d-i passwd/root-password-again password this-very-very-secure-password-will-be-r d-i clock-setup/utc boolean true -d-i time/zone string Europe/Vienna +d-i time/zone string {{ preseed_timezone }} d-i clock-setup/ntp boolean false diff --git a/roles/installer/debian/preseed/templates/preseed_ubuntu-xenial.cfg.j2 b/roles/installer/debian/preseed/templates/preseed_ubuntu-xenial.cfg.j2 index 28d68250..fbebcddf 100644 --- a/roles/installer/debian/preseed/templates/preseed_ubuntu-xenial.cfg.j2 +++ b/roles/installer/debian/preseed/templates/preseed_ubuntu-xenial.cfg.j2 @@ -2,14 +2,16 @@ # spreadspace preseed file for Ubuntu xenial based machines ######################################################################### -d-i debian-installer/language string en -d-i debian-installer/country string AT -d-i debian-installer/locale string en_US.UTF-8 -d-i localechooser/preferred-locale string en_US.UTF-8 -d-i localechooser/supported-locales multiselect de_DE.UTF-8, de_AT.UTF-8 +d-i debian-installer/language string {{ preseed_language }} +d-i debian-installer/country string {{ preseed_country }} +d-i debian-installer/locale string {{ preseed_locales | first }} +d-i localechooser/preferred-locale string {{ preseed_locales | first }} +d-i localechooser/supported-locales multiselect {{ preseed_locales | join(', ') }} +d-i localechooser/translation/warn-light boolean true + d-i console-setup/ask_detect boolean false -d-i keyboard-configuration/xkb-keymap select us -d-i keyboard-configuration/layoutcode string us +d-i keyboard-configuration/layoutcode string {{ preseed_keyboard_layout }} +d-i keyboard-configuration/variantcode string {{ preseed_keyboard_variant }} d-i hw-detect/load_firmware boolean false @@ -47,7 +49,7 @@ d-i passwd/root-password-again password this-very-very-secure-password-will-be-r d-i clock-setup/utc boolean true -d-i time/zone string Europe/Vienna +d-i time/zone string {{ preseed_timezone }} d-i clock-setup/ntp boolean false diff --git a/roles/installer/debian/preseed/templates/preseed_xubuntu-focal-desktop.cfg.j2 b/roles/installer/debian/preseed/templates/preseed_xubuntu-focal-desktop.cfg.j2 deleted file mode 100644 index ee4eb717..00000000 --- a/roles/installer/debian/preseed/templates/preseed_xubuntu-focal-desktop.cfg.j2 +++ /dev/null @@ -1,112 +0,0 @@ -######################################################################### -# spreadspace preseed file for Ubuntu focal based workstations -######################################################################### - -d-i debian-installer/language string en -d-i debian-installer/country string AT -d-i debian-installer/locale string de_AT.UTF-8 -d-i localechooser/preferred-locale string de_AT.UTF-8 -d-i localechooser/supported-locales multiselect de_DE.UTF-8, en_US.UTF-8 -d-i keyboard-configuration/xkb-keymap select de -## TODO: this still doesn't work properly... -d-i keyboard-configuration/layout select German (Austria) -d-i keyboard-configuration/layoutcode string at -d-i keyboard-configuration/layoutcode string nodeadkeys -d-i console-setup/ask_detect boolean false - -d-i hw-detect/load_firmware boolean false - -{% if preseed_no_netplan %} -d-i netcfg/do_not_use_netplan boolean true -{% endif %} -d-i netcfg/choose_interface select {{ install_interface | default(hostvars[install_hostname].network_cooked.primary.name) }} -{% if 'install_dhcp' in hostvars[install_hostname] and hostvars[install_hostname].install_dhcp %} -d-i netcfg/disable_dhcp boolean false -d-i netcfg/disable_autoconfig boolean false -{% else %} -d-i netcfg/disable_dhcp boolean true -d-i netcfg/disable_autoconfig boolean true -d-i netcfg/get_ipaddress string {{ hostvars[install_hostname].network_cooked.primary.address | ipaddr('address') }} -d-i netcfg/get_netmask string {{ hostvars[install_hostname].network_cooked.primary.address | ipaddr('netmask') }} -d-i netcfg/get_gateway string {{ hostvars[install_hostname].network_cooked.primary.gateway }} -d-i netcfg/get_nameservers string {{ hostvars[install_hostname].network_cooked.nameservers | join(' ') }} -d-i netcfg/confirm_static boolean true -{% endif %} - -d-i netcfg/hostname string {{ hostvars[install_hostname].host_name }} -d-i netcfg/get_hostname string {{ hostvars[install_hostname].host_name }} -d-i netcfg/domain string {{ hostvars[install_hostname].network_cooked.domain }} -d-i netcfg/get_domain string {{ hostvars[install_hostname].network_cooked.domain }} -d-i netcfg/wireless_wep string - - -d-i mirror/country string manual -d-i mirror/http/hostname string {{ apt_repo_providers[hostvars[install_hostname].apt_repo_provider].ubuntu.host }} -d-i mirror/http/directory string {{ apt_repo_providers[hostvars[install_hostname].apt_repo_provider].ubuntu.path }} -d-i mirror/http/proxy string - - -d-i passwd/make-user boolean false -d-i passwd/root-login boolean true -d-i passwd/root-password password this-very-very-secure-password-will-be-removed-by-latecommand -d-i passwd/root-password-again password this-very-very-secure-password-will-be-removed-by-latecommand - - -d-i clock-setup/utc boolean true -d-i time/zone string Europe/Vienna -d-i clock-setup/ntp boolean false - - -{% include 'partman_config.j2' %} - - -{% if preseed_kernel_image is defined %} -d-i base-installer/kernel/image string {{ preseed_kernel_image }} -{% elif preseed_virtual_machine %} -d-i base-installer/kernel/image string linux-virtual -{% endif %} -{% if preseed_no_splash %} -d-i debian-installer/splash boolean false -d-i debian-installer/add-kernel-opts string nosplash -{% endif %} - -d-i base-installer/install-recommends boolean false -d-i apt-setup/security_host string {{ apt_repo_providers[hostvars[install_hostname].apt_repo_provider].ubuntu.host }} -d-i apt-setup/security_path string {{ apt_repo_providers[hostvars[install_hostname].apt_repo_provider].ubuntu.path }} -{% if hostvars[install_hostname].install_cooked.arch | default('amd64') == 'amd64' %} -d-i apt-setup/multiarch string amd64 -{% endif %} - -tasksel tasksel/first multiselect {{ preseed_install_tasks | join(', ') }} -d-i pkgsel/include string openssh-server {{ hostvars[install_hostname].python_basename }} {{ hostvars[install_hostname].python_basename }}-apt{% if preseed_no_netplan %} ifupdown{% endif %}{{ '' }} -d-i pkgsel/upgrade select safe-upgrade -popularity-contest popularity-contest/participate boolean false -d-i pkgsel/update-policy select none - -d-i finish-install/reboot_in_progress note - - -d-i preseed/late_command string \ - lvremove -f {{ hostvars[install_hostname].host_name }}/dummy; \ - in-target bash -c "swapoff -a; sed -e '/^\/swapfile/d' -i /etc/fstab; rm -f /swapfile"; \ - in-target bash -c "apt-get update -q && apt-get full-upgrade -y -q"; \ - in-target bash -c "env SUDO_FORCE_REMOVE=yes apt-get purge -y -q ubuntu-minimal sudo ubuntu-advantage-tools"; \ -{% if preseed_no_netplan %} - in-target bash -c "apt-get purge -y -q netplan.io && apt-get autoremove -y -q && rm -rf /etc/netplan"; \ -{% endif %} - in-target bash -c "sed -e 's/^allow-hotplug/auto/' -i /etc/network/interfaces"; \ -{% if preseed_force_net_ifnames_policy is defined %} - mkdir -p /target/etc/systemd/network; \ - in-target bash -c "echo '[Match]' > /etc/systemd/network/90-namepolicy.link"; \ - in-target bash -c "echo 'OriginalName=*' >> /etc/systemd/network/90-namepolicy.link"; \ - in-target bash -c "echo '' >> /etc/systemd/network/90-namepolicy.link"; \ - in-target bash -c "echo '[Link]' >> /etc/systemd/network/90-namepolicy.link"; \ - in-target bash -c "echo 'NamePolicy={{ preseed_force_net_ifnames_policy }}' >> /etc/systemd/network/90-namepolicy.link"; \ - in-target bash -c "update-initramfs -u"; \ -{% endif %} - in-target bash -c "passwd -d root && passwd -l root"; \ -{% if hostvars[install_hostname].ansible_port is defined %} - in-target bash -c "sed -e 's/^\(\s*#*\s*Port.*\)/Port {{ hostvars[install_hostname].ansible_port }}/' -i /etc/ssh/sshd_config"; \ -{% endif %} - mkdir -p -m 0700 /target/root/.ssh; \ - cp /authorized_keys /target/root/.ssh/ diff --git a/roles/installer/debian/usb/templates/syslinux.cfg.j2 b/roles/installer/debian/usb/templates/syslinux.cfg.j2 index c6acadd3..4531c1f9 100644 --- a/roles/installer/debian/usb/templates/syslinux.cfg.j2 +++ b/roles/installer/debian/usb/templates/syslinux.cfg.j2 @@ -21,5 +21,5 @@ LABEL {{ host }} MENU LABEL automatic installer for {{ host }} KERNEL {{ syslinux_base_path }}linux INITRD {{ syslinux_base_path }}initrd.{{ host }}.gz - APPEND auto=true fb=false {{ (hostvars[host].install_cooked.kernel_cmdline | default([])) | join(' ') }} + APPEND auto fb=false {{ (hostvars[host].install_cooked.kernel_cmdline | default([])) | join(' ') }} {% endfor %} |