harmonize variable names used by debian/preseed installer role

1 files changed, 19 insertions, 19 deletions

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 f33098a3..25c5f13d 100644
--- a/roles/installer/debian/preseed/templates/preseed_ubuntu-focal.cfg.j2
+++ b/roles/installer/debian/preseed/templates/preseed_ubuntu-focal.cfg.j2
@@ -2,20 +2,20 @@
 #  spreadspace preseed file for Ubuntu focal based machines
 #########################################################################
 
-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 debian-installer/language string {{ debian_preseed_language }}
+d-i debian-installer/country string {{ debian_preseed_country }}
+d-i debian-installer/locale string {{ debian_preseed_locales | first }}
+d-i localechooser/preferred-locale string {{ debian_preseed_locales | first }}
+d-i localechooser/supported-locales multiselect {{ debian_preseed_locales | join(', ') }}
 d-i localechooser/translation/warn-light boolean true
 
 d-i console-setup/ask_detect boolean false
-d-i keyboard-configuration/layoutcode string {{ preseed_keyboard_layout }}
-d-i keyboard-configuration/variantcode string {{ preseed_keyboard_variant }}
+d-i keyboard-configuration/layoutcode string {{ debian_preseed_keyboard_layout }}
+d-i keyboard-configuration/variantcode string {{ debian_preseed_keyboard_variant }}
 
 d-i hw-detect/load_firmware boolean false
 
-{% if preseed_no_netplan %}
+{% 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) }}
@@ -52,21 +52,21 @@ 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 {{ preseed_timezone }}
+d-i time/zone string {{ debian_preseed_timezone }}
 d-i clock-setup/ntp boolean false
 
 
-{% if not preseed_manual_partitioning %}
+{% if not debian_preseed_manual_partitioning %}
 {% include 'partman_config.j2' %}
 {% endif %}
 
 
-{% if preseed_kernel_image is defined %}
-d-i base-installer/kernel/image string {{ preseed_kernel_image }}
-{% elif preseed_virtual_machine %}
+{% if debian_preseed_kernel_image is defined %}
+d-i base-installer/kernel/image string {{ debian_preseed_kernel_image }}
+{% elif debian_preseed_virtual_machine %}
 d-i base-installer/kernel/image string linux-virtual
 {% endif %}
-{% if preseed_no_splash %}
+{% if debian_preseed_no_splash %}
 d-i debian-installer/splash boolean false
 d-i debian-installer/add-kernel-opts string nosplash
 {% endif %}
@@ -78,8 +78,8 @@ d-i apt-setup/security_path string {{ apt_repo_providers[apt_repo_provider].ubun
 d-i apt-setup/multiarch string amd64
 {% endif %}
 
-tasksel tasksel/first multiselect {{ preseed_install_tasks | join(', ') }}
-d-i pkgsel/include string openssh-server {{ python_basename }} {{ python_basename }}-apt{% if preseed_no_netplan %} ifupdown{% endif %}{{ '' }}
+tasksel tasksel/first multiselect {{ debian_preseed_install_tasks | join(', ') }}
+d-i pkgsel/include string openssh-server {{ python_basename }} {{ python_basename }}-apt{% if debian_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
@@ -92,17 +92,17 @@ d-i preseed/late_command string \
     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 %}
+{% if debian_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 %}
+{% if debian_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 "echo 'NamePolicy={{ debian_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"; \