summaryrefslogtreecommitdiff
path: root/roles/installer/debian/preseed/templates/preseed_ubuntu-xenial.cfg.j2
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2020-09-15 20:39:22 +0200
committerChristian Pointner <equinox@spreadspace.org>2020-09-15 20:39:22 +0200
commita9ae6e7d0731f19cf5d01a429a5b5b5b2e7e5d04 (patch)
tree2a81e4f7d482c688a015eb7e96b5be8b16ed7886 /roles/installer/debian/preseed/templates/preseed_ubuntu-xenial.cfg.j2
parentadd constructed inventory (diff)
improve handling of apt-repo providers
Diffstat (limited to 'roles/installer/debian/preseed/templates/preseed_ubuntu-xenial.cfg.j2')
-rw-r--r--roles/installer/debian/preseed/templates/preseed_ubuntu-xenial.cfg.j27
1 files changed, 4 insertions, 3 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 758cf961..4b144cef 100644
--- a/roles/installer/debian/preseed/templates/preseed_ubuntu-xenial.cfg.j2
+++ b/roles/installer/debian/preseed/templates/preseed_ubuntu-xenial.cfg.j2
@@ -35,8 +35,8 @@ 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 }}
-d-i mirror/http/directory string /ubuntu
+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
@@ -55,7 +55,8 @@ d-i clock-setup/ntp boolean false
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 }}
+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 %}