1 files changed, 19 insertions, 19 deletions
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 fbebcddf..e9ac5d8c 100644
--- a/roles/installer/debian/preseed/templates/preseed_ubuntu-xenial.cfg.j2
+++ b/roles/installer/debian/preseed/templates/preseed_ubuntu-xenial.cfg.j2
@@ -15,30 +15,30 @@ d-i keyboard-configuration/variantcode string {{ preseed_keyboard_variant }}
 
 d-i hw-detect/load_firmware boolean false
 
-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/choose_interface select {{ install_interface | default(network_cooked.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 {{ 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/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/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/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/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/hostname string {{ apt_repo_providers[apt_repo_provider].ubuntu.host }}
+d-i mirror/http/directory string {{ apt_repo_providers[apt_repo_provider].ubuntu.path }}
 d-i mirror/http/proxy string
 
 
@@ -67,14 +67,14 @@ 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/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' %}
 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
+d-i pkgsel/include string openssh-server {{ python_basename }} {{ python_basename }}-apt
 d-i pkgsel/upgrade select safe-upgrade
 popularity-contest popularity-contest/participate boolean false
 d-i pkgsel/update-policy select none
@@ -83,7 +83,7 @@ d-i finish-install/reboot_in_progress note
 
 
 d-i preseed/late_command string \
-    lvremove -f {{ hostvars[install_hostname].host_name }}/dummy; \
+    lvremove -f {{ host_name }}/dummy; \
     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"; \
     in-target bash -c "sed -e 's/^allow-hotplug/auto/' -i /etc/network/interfaces"; \
@@ -94,8 +94,8 @@ d-i preseed/late_command string \
     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"; \
+{% if ansible_port is defined %}
+    in-target bash -c "sed -e 's/^\(\s*#*\s*Port.*\)/Port {{ ansible_port }}/' -i /etc/ssh/sshd_config"; \
 {% endif %}
     mkdir -p -m 0700 /target/root/.ssh; \
     cp /authorized_keys /target/root/.ssh/