From d90144d2190009f8bd121cb8f773a9209500f034 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Sat, 1 Jan 2022 20:19:56 +0100 Subject: in-place variable cooking --- .../installer/debian/preseed/templates/partman_config.j2 | 14 +++++++------- .../debian/preseed/templates/partman_early-command.sh.j2 | 10 +++++----- .../preseed/templates/preseed_debian-bullseye.cfg.j2 | 14 +++++++------- .../preseed/templates/preseed_debian-buster.cfg.j2 | 14 +++++++------- .../preseed/templates/preseed_debian-jessie.cfg.j2 | 14 +++++++------- .../preseed/templates/preseed_debian-stretch.cfg.j2 | 14 +++++++------- .../preseed/templates/preseed_ubuntu-bionic.cfg.j2 | 16 ++++++++-------- .../debian/preseed/templates/preseed_ubuntu-focal.cfg.j2 | 16 ++++++++-------- .../preseed/templates/preseed_ubuntu-xenial.cfg.j2 | 16 ++++++++-------- 9 files changed, 64 insertions(+), 64 deletions(-) (limited to 'roles/installer/debian/preseed/templates') diff --git a/roles/installer/debian/preseed/templates/partman_config.j2 b/roles/installer/debian/preseed/templates/partman_config.j2 index 77bc0f8b..70d218a7 100644 --- a/roles/installer/debian/preseed/templates/partman_config.j2 +++ b/roles/installer/debian/preseed/templates/partman_config.j2 @@ -15,7 +15,7 @@ d-i partman-auto-lvm/new_vg_name string {{ host_name }} d-i partman-auto-lvm/guided_size string max d-i partman-auto-lvm/no_boot boolean true -{% if (install_cooked.efi | default(false)) %} +{% if (install.efi | default(false)) %} d-i partman-efi/non_efi_system boolean true d-i partman/choose_label string gpt d-i partman/default_label string gpt @@ -32,29 +32,29 @@ d-i partman-basicfilesystems/choose_label string msdos d-i partman-basicfilesystems/default_label string msdos {% endif %} -{% set system_lvm_size = install_cooked.system_lvm.size | default(debian_preseed_system_lvm_size_default) %} -{% set system_lvm_volumes = install_cooked.system_lvm.volumes | default(debian_preseed_system_lvm_volumes_default) %} +{% set system_lvm_size = install.system_lvm.size | default(debian_preseed_system_lvm_size_default) %} +{% set system_lvm_volumes = install.system_lvm.volumes | default(debian_preseed_system_lvm_volumes_default) %} {# on small disks this probably triggers: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=896826 ... #} -{# set system_lvm_reserve = install_cooked.system_lvm.reserve | default(debian_preseed_system_lvm_reserve_default) #} +{# set system_lvm_reserve = install.system_lvm.reserve | default(debian_preseed_system_lvm_reserve_default) #} {# set system_lvm_pv_size_min_mb = (((system_lvm_volumes | map(attribute='size') | map('human_to_bytes') | sum) / (1024*1024)) | int) + (((system_lvm_reserve | human_to_bytes) / (1024*1024)) | int) #} {# ... so let's go for a 1 MB minimum. #} {% set system_lvm_pv_size_min_mb = 1 %} -{% if install_cooked.disks.primary == "software-raid" %} +{% if install.disks.primary == "software-raid" %} d-i partman-auto/method string raid {% else %} d-i partman-auto/method string lvm {% endif %} d-i partman-auto/expert_recipe string \ ansible :: \ -{% if (install_cooked.efi | default(false)) %} +{% if (install.efi | default(false)) %} {% set efi_esp_size_mb = ((debian_preseed_efi_esp_size | human_to_bytes) / (1024*1024)) | int %} {{ efi_esp_size_mb }} {{ efi_esp_size_mb }} {{ efi_esp_size_mb }} fat16 \ $primary{ } $bootable{ } \ method{ efi } format{ } \ . \ {% endif %} -{% if install_cooked.disks.primary == "software-raid" %} +{% if install.disks.primary == "software-raid" %} {% set swraid_boot_size_mb = ((debian_preseed_swraid_boot_size | human_to_bytes) / (1024*1024)) | int %} {{ swraid_boot_size_mb }} {{ swraid_boot_size_mb }} {{ swraid_boot_size_mb }} raid \ $lvmignore{ } $primary{ } $bootable{ } \ diff --git a/roles/installer/debian/preseed/templates/partman_early-command.sh.j2 b/roles/installer/debian/preseed/templates/partman_early-command.sh.j2 index c7ceb8c6..4e8215c2 100644 --- a/roles/installer/debian/preseed/templates/partman_early-command.sh.j2 +++ b/roles/installer/debian/preseed/templates/partman_early-command.sh.j2 @@ -3,10 +3,10 @@ umount -l /media || true -{% if install_cooked.disks.primary == "software-raid" %} -disks="{% for disk in install_cooked.disks.raid.members %}$(readlink -f {{ disk }}) {% endfor %}" +{% if install.disks.primary == "software-raid" %} +disks="{% for disk in install.disks.raid.members %}$(readlink -f {{ disk }}) {% endfor %}" -{% if (install_cooked.efi | default(false)) %} +{% if (install.efi | default(false)) %} idx=1 {% else %} idx=0 @@ -24,11 +24,11 @@ for disk in $disks; do raid_members_lvm="$raid_members_lvm$disk"p$((idx + 2)) fi done -raid_config="{{ install_cooked.disks.raid.level }} {{ install_cooked.disks.raid.members | length }} 0" +raid_config="{{ install.disks.raid.level }} {{ install.disks.raid.members | length }} 0" debconf-set partman-auto-raid/recipe "$raid_config ext4 /boot $raid_members_boot . $raid_config lvm - $raid_members_lvm ." {% else %} -disks="$(readlink -f {{ install_cooked.disks.primary }})" +disks="$(readlink -f {{ install.disks.primary }})" {% endif %} debconf-set partman-auto/disk "$disks" debconf-set grub-installer/bootdev "$disks" 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 fa3304f4..e4c0a80c 100644 --- a/roles/installer/debian/preseed/templates/preseed_debian-bullseye.cfg.j2 +++ b/roles/installer/debian/preseed/templates/preseed_debian-bullseye.cfg.j2 @@ -14,24 +14,24 @@ d-i keyboard-configuration/variantcode string {{ debian_preseed_keyboard_variant d-i hw-detect/load_firmware boolean false -d-i netcfg/choose_interface select {{ install_interface | default(network_cooked.primary.name) }} +d-i netcfg/choose_interface select {{ install_interface | default(network.primary.name) }} {% if (install_dhcp | default(false)) %} 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 {{ network_cooked.primary.address | ipaddr('address') }} -d-i netcfg/get_netmask string {{ network_cooked.primary.address | ipaddr('netmask') }} -d-i netcfg/get_gateway string {{ network_cooked.primary.gateway }} -d-i netcfg/get_nameservers string {{ network_cooked.nameservers | join(' ') }} +d-i netcfg/get_ipaddress string {{ network.primary.address | ipaddr('address') }} +d-i netcfg/get_netmask string {{ network.primary.address | ipaddr('netmask') }} +d-i netcfg/get_gateway string {{ network.primary.gateway }} +d-i netcfg/get_nameservers string {{ network.nameservers | join(' ') }} d-i netcfg/confirm_static boolean true {% endif %} d-i netcfg/hostname string {{ host_name }} d-i netcfg/get_hostname string {{ host_name }} -d-i netcfg/domain string {{ network_cooked.domain }} -d-i netcfg/get_domain string {{ network_cooked.domain }} +d-i netcfg/domain string {{ network.domain }} +d-i netcfg/get_domain string {{ network.domain }} d-i netcfg/wireless_wep string 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 23fe064d..edd360e1 100644 --- a/roles/installer/debian/preseed/templates/preseed_debian-buster.cfg.j2 +++ b/roles/installer/debian/preseed/templates/preseed_debian-buster.cfg.j2 @@ -14,24 +14,24 @@ d-i keyboard-configuration/variantcode string {{ debian_preseed_keyboard_variant d-i hw-detect/load_firmware boolean false -d-i netcfg/choose_interface select {{ install_interface | default(network_cooked.primary.name) }} +d-i netcfg/choose_interface select {{ install_interface | default(network.primary.name) }} {% if (install_dhcp | default(false)) %} 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 {{ network_cooked.primary.address | ipaddr('address') }} -d-i netcfg/get_netmask string {{ network_cooked.primary.address | ipaddr('netmask') }} -d-i netcfg/get_gateway string {{ network_cooked.primary.gateway }} -d-i netcfg/get_nameservers string {{ network_cooked.nameservers | join(' ') }} +d-i netcfg/get_ipaddress string {{ network.primary.address | ipaddr('address') }} +d-i netcfg/get_netmask string {{ network.primary.address | ipaddr('netmask') }} +d-i netcfg/get_gateway string {{ network.primary.gateway }} +d-i netcfg/get_nameservers string {{ network.nameservers | join(' ') }} d-i netcfg/confirm_static boolean true {% endif %} d-i netcfg/hostname string {{ host_name }} d-i netcfg/get_hostname string {{ host_name }} -d-i netcfg/domain string {{ network_cooked.domain }} -d-i netcfg/get_domain string {{ network_cooked.domain }} +d-i netcfg/domain string {{ network.domain }} +d-i netcfg/get_domain string {{ network.domain }} d-i netcfg/wireless_wep string 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 46a8be9a..39d17262 100644 --- a/roles/installer/debian/preseed/templates/preseed_debian-jessie.cfg.j2 +++ b/roles/installer/debian/preseed/templates/preseed_debian-jessie.cfg.j2 @@ -14,24 +14,24 @@ d-i keyboard-configuration/variantcode string {{ debian_preseed_keyboard_variant d-i hw-detect/load_firmware boolean false -d-i netcfg/choose_interface select {{ install_interface | default(network_cooked.primary.name) }} +d-i netcfg/choose_interface select {{ install_interface | default(network.primary.name) }} {% if (install_dhcp | default(false)) %} 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 {{ network_cooked.primary.address | ipaddr('address') }} -d-i netcfg/get_netmask string {{ network_cooked.primary.address | ipaddr('netmask') }} -d-i netcfg/get_gateway string {{ network_cooked.primary.gateway }} -d-i netcfg/get_nameservers string {{ network_cooked.nameservers | join(' ') }} +d-i netcfg/get_ipaddress string {{ network.primary.address | ipaddr('address') }} +d-i netcfg/get_netmask string {{ network.primary.address | ipaddr('netmask') }} +d-i netcfg/get_gateway string {{ network.primary.gateway }} +d-i netcfg/get_nameservers string {{ network.nameservers | join(' ') }} d-i netcfg/confirm_static boolean true {% endif %} d-i netcfg/hostname string {{ host_name }} d-i netcfg/get_hostname string {{ host_name }} -d-i netcfg/domain string {{ network_cooked.domain }} -d-i netcfg/get_domain string {{ network_cooked.domain }} +d-i netcfg/domain string {{ network.domain }} +d-i netcfg/get_domain string {{ network.domain }} d-i netcfg/wireless_wep string 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 172f1879..4c7b2f12 100644 --- a/roles/installer/debian/preseed/templates/preseed_debian-stretch.cfg.j2 +++ b/roles/installer/debian/preseed/templates/preseed_debian-stretch.cfg.j2 @@ -14,24 +14,24 @@ d-i keyboard-configuration/variantcode string {{ debian_preseed_keyboard_variant d-i hw-detect/load_firmware boolean false -d-i netcfg/choose_interface select {{ install_interface | default(network_cooked.primary.name) }} +d-i netcfg/choose_interface select {{ install_interface | default(network.primary.name) }} {% if (install_dhcp | default(false)) %} 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 {{ network_cooked.primary.address | ipaddr('address') }} -d-i netcfg/get_netmask string {{ network_cooked.primary.address | ipaddr('netmask') }} -d-i netcfg/get_gateway string {{ network_cooked.primary.gateway }} -d-i netcfg/get_nameservers string {{ network_cooked.nameservers | join(' ') }} +d-i netcfg/get_ipaddress string {{ network.primary.address | ipaddr('address') }} +d-i netcfg/get_netmask string {{ network.primary.address | ipaddr('netmask') }} +d-i netcfg/get_gateway string {{ network.primary.gateway }} +d-i netcfg/get_nameservers string {{ network.nameservers | join(' ') }} d-i netcfg/confirm_static boolean true {% endif %} d-i netcfg/hostname string {{ host_name }} d-i netcfg/get_hostname string {{ host_name }} -d-i netcfg/domain string {{ network_cooked.domain }} -d-i netcfg/get_domain string {{ network_cooked.domain }} +d-i netcfg/domain string {{ network.domain }} +d-i netcfg/get_domain string {{ network.domain }} d-i netcfg/wireless_wep string 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 3f31f66b..a36e3d9d 100644 --- a/roles/installer/debian/preseed/templates/preseed_ubuntu-bionic.cfg.j2 +++ b/roles/installer/debian/preseed/templates/preseed_ubuntu-bionic.cfg.j2 @@ -18,24 +18,24 @@ d-i hw-detect/load_firmware boolean false {% if debian_preseed_no_netplan %} d-i netcfg/do_not_use_netplan boolean true {% endif %} -d-i netcfg/choose_interface select {{ install_interface | default(network_cooked.primary.name) }} +d-i netcfg/choose_interface select {{ install_interface | default(network.primary.name) }} {% if (install_dhcp | default(false)) %} 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 {{ network_cooked.primary.address | ipaddr('address') }} -d-i netcfg/get_netmask string {{ network_cooked.primary.address | ipaddr('netmask') }} -d-i netcfg/get_gateway string {{ network_cooked.primary.gateway }} -d-i netcfg/get_nameservers string {{ network_cooked.nameservers | join(' ') }} +d-i netcfg/get_ipaddress string {{ network.primary.address | ipaddr('address') }} +d-i netcfg/get_netmask string {{ network.primary.address | ipaddr('netmask') }} +d-i netcfg/get_gateway string {{ network.primary.gateway }} +d-i netcfg/get_nameservers string {{ network.nameservers | join(' ') }} d-i netcfg/confirm_static boolean true {% endif %} d-i netcfg/hostname string {{ host_name }} d-i netcfg/get_hostname string {{ host_name }} -d-i netcfg/domain string {{ network_cooked.domain }} -d-i netcfg/get_domain string {{ network_cooked.domain }} +d-i netcfg/domain string {{ network.domain }} +d-i netcfg/get_domain string {{ network.domain }} d-i netcfg/wireless_wep string @@ -74,7 +74,7 @@ d-i debian-installer/add-kernel-opts string nosplash d-i base-installer/install-recommends boolean false d-i apt-setup/security_host string {{ apt_repo_providers[apt_repo_provider].ubuntu.host }} d-i apt-setup/security_path string {{ apt_repo_providers[apt_repo_provider].ubuntu.path }} -{% if install_cooked.arch | default('amd64') == 'amd64' %} +{% if install.arch | default('amd64') == 'amd64' %} d-i apt-setup/multiarch string amd64 {% endif %} 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 f895a668..abcbe576 100644 --- a/roles/installer/debian/preseed/templates/preseed_ubuntu-focal.cfg.j2 +++ b/roles/installer/debian/preseed/templates/preseed_ubuntu-focal.cfg.j2 @@ -18,24 +18,24 @@ d-i hw-detect/load_firmware boolean false {% if debian_preseed_no_netplan %} d-i netcfg/do_not_use_netplan boolean true {% endif %} -d-i netcfg/choose_interface select {{ install_interface | default(network_cooked.primary.name) }} +d-i netcfg/choose_interface select {{ install_interface | default(network.primary.name) }} {% if (install_dhcp | default(false)) %} 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 {{ network_cooked.primary.address | ipaddr('address') }} -d-i netcfg/get_netmask string {{ network_cooked.primary.address | ipaddr('netmask') }} -d-i netcfg/get_gateway string {{ network_cooked.primary.gateway }} -d-i netcfg/get_nameservers string {{ network_cooked.nameservers | join(' ') }} +d-i netcfg/get_ipaddress string {{ network.primary.address | ipaddr('address') }} +d-i netcfg/get_netmask string {{ network.primary.address | ipaddr('netmask') }} +d-i netcfg/get_gateway string {{ network.primary.gateway }} +d-i netcfg/get_nameservers string {{ network.nameservers | join(' ') }} d-i netcfg/confirm_static boolean true {% endif %} d-i netcfg/hostname string {{ host_name }} d-i netcfg/get_hostname string {{ host_name }} -d-i netcfg/domain string {{ network_cooked.domain }} -d-i netcfg/get_domain string {{ network_cooked.domain }} +d-i netcfg/domain string {{ network.domain }} +d-i netcfg/get_domain string {{ network.domain }} d-i netcfg/wireless_wep string @@ -74,7 +74,7 @@ d-i debian-installer/add-kernel-opts string nosplash d-i base-installer/install-recommends boolean false d-i apt-setup/security_host string {{ apt_repo_providers[apt_repo_provider].ubuntu.host }} d-i apt-setup/security_path string {{ apt_repo_providers[apt_repo_provider].ubuntu.path }} -{% if install_cooked.arch | default('amd64') == 'amd64' %} +{% if install.arch | default('amd64') == 'amd64' %} d-i apt-setup/multiarch string amd64 {% endif %} 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 248afd67..3a8e35b5 100644 --- a/roles/installer/debian/preseed/templates/preseed_ubuntu-xenial.cfg.j2 +++ b/roles/installer/debian/preseed/templates/preseed_ubuntu-xenial.cfg.j2 @@ -15,24 +15,24 @@ d-i keyboard-configuration/variantcode string {{ debian_preseed_keyboard_variant d-i hw-detect/load_firmware boolean false -d-i netcfg/choose_interface select {{ install_interface | default(network_cooked.primary.name) }} +d-i netcfg/choose_interface select {{ install_interface | default(network.primary.name) }} {% if (install_dhcp | default(false)) %} 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 {{ network_cooked.primary.address | ipaddr('address') }} -d-i netcfg/get_netmask string {{ network_cooked.primary.address | ipaddr('netmask') }} -d-i netcfg/get_gateway string {{ network_cooked.primary.gateway }} -d-i netcfg/get_nameservers string {{ network_cooked.nameservers | join(' ') }} +d-i netcfg/get_ipaddress string {{ network.primary.address | ipaddr('address') }} +d-i netcfg/get_netmask string {{ network.primary.address | ipaddr('netmask') }} +d-i netcfg/get_gateway string {{ network.primary.gateway }} +d-i netcfg/get_nameservers string {{ network.nameservers | join(' ') }} d-i netcfg/confirm_static boolean true {% endif %} d-i netcfg/hostname string {{ host_name }} d-i netcfg/get_hostname string {{ host_name }} -d-i netcfg/domain string {{ network_cooked.domain }} -d-i netcfg/get_domain string {{ network_cooked.domain }} +d-i netcfg/domain string {{ network.domain }} +d-i netcfg/get_domain string {{ network.domain }} d-i netcfg/wireless_wep string @@ -71,7 +71,7 @@ d-i debian-installer/add-kernel-opts string nosplash d-i base-installer/install-recommends boolean false d-i apt-setup/security_host string {{ apt_repo_providers[apt_repo_provider].ubuntu.host }} d-i apt-setup/security_path string {{ apt_repo_providers[apt_repo_provider].ubuntu.path }} -{% if install_cooked.arch | default('amd64') == 'amd64' %} +{% if install.arch | default('amd64') == 'amd64' %} d-i apt-setup/multiarch string amd64 {% endif %} -- cgit v1.2.3