From 1065bfab05e31478ee1d5624e6af51899c2d7c2a Mon Sep 17 00:00:00 2001 From: Emiliano Vavassori Date: Mon, 15 Feb 2016 22:04:13 +0100 Subject: [PATCH] Adding variables to default remote installation. Variables are overrideable via command line. --- domain.yml | 1 + roles/preseed/defaults/main.yml | 4 ++++ roles/preseed/templates/preseed/client-trusty.seed | 8 ++++---- roles/preseed/templates/preseed/docenti-trusty.seed | 8 ++++---- roles/preseed/templates/preseed/edubuntu.seed | 8 ++++---- 5 files changed, 17 insertions(+), 12 deletions(-) diff --git a/domain.yml b/domain.yml index c71e511..5cdfcbf 100644 --- a/domain.yml +++ b/domain.yml @@ -21,5 +21,6 @@ org_city: Caravaggio org_phone: "+39 0363 50598" org_street: "Via Zenale e Butinone, 20" mirror_mode: nfs +remote_mirror: ubuntu.fastbull.org mirror_nfs_share: 192.168.255.1:/var/spool/apt-mirror/mirror mirrorpath: pdc.mastri.edu/ks/mirror/ diff --git a/roles/preseed/defaults/main.yml b/roles/preseed/defaults/main.yml index 32b0575..6d2939f 100644 --- a/roles/preseed/defaults/main.yml +++ b/roles/preseed/defaults/main.yml @@ -1,2 +1,6 @@ --- execmirrorpath: "" +remote_mirror: archive.ubuntu.com +remote_mirrorpath: /ubuntu +remote_security_mirror: security.ubuntu.com +remote_security_mirrorpath: /ubuntu diff --git a/roles/preseed/templates/preseed/client-trusty.seed b/roles/preseed/templates/preseed/client-trusty.seed index 6d43d9a..73df49e 100644 --- a/roles/preseed/templates/preseed/client-trusty.seed +++ b/roles/preseed/templates/preseed/client-trusty.seed @@ -25,8 +25,8 @@ d-i mirror/protocol string http d-i mirror/http/hostname string {{ ansible_local.domain.serverfqdn }} d-i mirror/http/directory string /ks/mirror/archive.ubuntu.com/ubuntu {% else %} -d-i mirror/http/hostname string archive.ubuntu.com -d-i mirror/http/directory string /ubuntu +d-i mirror/http/hostname string {{ remote_mirror }} +d-i mirror/http/directory string {{ remote_mirrorpath }} {% endif %} d-i mirror/http/proxy string d-i mirror/suite string trusty @@ -43,8 +43,8 @@ d-i apt-setup/services-select multiselect security, updates d-i apt-setup/security_host string {{ ansible_local.domain.serverfqdn }} d-i apt-setup/security_path string /ks/mirror/security.ubuntu.com/ubuntu {% else %} -d-i apt-setup/security_host string security.ubuntu.com -d-i apt-setup/security_path string /ubuntu +d-i apt-setup/security_host string {{ remote_security_mirror }} +d-i apt-setup/security_path string {{ remote_security_mirrorpath }} {% endif %} # Setup and enable libreoffice PPA diff --git a/roles/preseed/templates/preseed/docenti-trusty.seed b/roles/preseed/templates/preseed/docenti-trusty.seed index 5963df1..b077fb1 100644 --- a/roles/preseed/templates/preseed/docenti-trusty.seed +++ b/roles/preseed/templates/preseed/docenti-trusty.seed @@ -25,8 +25,8 @@ d-i mirror/protocol string http d-i mirror/http/hostname string {{ ansible_local.domain.serverfqdn }} d-i mirror/http/directory string /ks/mirror/archive.ubuntu.com/ubuntu {% else %} -d-i mirror/http/hostname string archive.ubuntu.com -d-i mirror/http/directory string /ubuntu +d-i mirror/http/hostname string {{ remote_mirror }} +d-i mirror/http/directory string {{ remote_mirrorpath }} {% endif %} d-i mirror/http/proxy string d-i mirror/suite string trusty @@ -43,8 +43,8 @@ d-i apt-setup/services-select multiselect security, updates d-i apt-setup/security_host string {{ ansible_local.domain.serverfqdn }} d-i apt-setup/security_path string /ks/mirror/security.ubuntu.com/ubuntu {% else %} -d-i apt-setup/security_host string security.ubuntu.com -d-i apt-setup/security_path string /ubuntu +d-i apt-setup/security_host string {{ remote_security_mirror }} +d-i apt-setup/security_path string {{ remote_security_mirrorpath }} {% endif %} # Setup and enable libreoffice PPA diff --git a/roles/preseed/templates/preseed/edubuntu.seed b/roles/preseed/templates/preseed/edubuntu.seed index fce7ebf..88ad3b5 100644 --- a/roles/preseed/templates/preseed/edubuntu.seed +++ b/roles/preseed/templates/preseed/edubuntu.seed @@ -26,8 +26,8 @@ d-i mirror/protocol string http d-i mirror/http/hostname string {{ ansible_local.domain.serverfqdn }} d-i mirror/http/directory string /ks/mirror/archive.ubuntu.com/ubuntu {% else %} -d-i mirror/http/hostname string archive.ubuntu.com -d-i mirror/http/directory string /ubuntu +d-i mirror/http/hostname string {{ remote_mirrorĀ }} +d-i mirror/http/directory string {{ remote_mirrorpath }} {% endif %} d-i mirror/http/proxy string d-i mirror/suite string trusty @@ -44,8 +44,8 @@ d-i apt-setup/services-select multiselect security, updates d-i apt-setup/security_host string {{ ansible_local.domain.serverfqdn }} d-i apt-setup/security_path string /ks/mirror/security.ubuntu.com/ubuntu {% else %} -d-i apt-setup/security_host string security.ubuntu.com -d-i apt-setup/security_path string /ubuntu +d-i apt-setup/security_host string {{ remote_security_mirror }} +d-i apt-setup/security_path string {{ remote_security_mirrorpath }} {% endif %} # Setup and enable libreoffice PPA