projects
/
noc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7240d3f
)
preseed: fix hostname and domain setting
author
Christian Pointner
<equinox@realraum.at>
Sat, 8 Dec 2018 00:14:26 +0000
(
01:14
+0100)
committer
Christian Pointner
<equinox@realraum.at>
Sat, 8 Dec 2018 03:16:59 +0000
(
04:16
+0100)
ansible/roles/preseed/templates/preseed_debian-stretch.cfg.j2
patch
|
blob
|
history
ansible/roles/preseed/templates/preseed_ubuntu-bionic.cfg.j2
patch
|
blob
|
history
ansible/roles/preseed/templates/preseed_ubuntu-xenial.cfg.j2
patch
|
blob
|
history
diff --git
a/ansible/roles/preseed/templates/preseed_debian-stretch.cfg.j2
b/ansible/roles/preseed/templates/preseed_debian-stretch.cfg.j2
index
29a5cbd
..
d7a21a8
100644
(file)
--- a/
ansible/roles/preseed/templates/preseed_debian-stretch.cfg.j2
+++ b/
ansible/roles/preseed/templates/preseed_debian-stretch.cfg.j2
@@
-18,7
+18,9
@@
d-i netcfg/get_gateway string {{ hostvars[hostname].network_cooked.primary.gatew
d-i netcfg/get_nameservers string {{ hostvars[hostname].network_cooked.nameservers | join(' ') }}
d-i netcfg/confirm_static boolean true
d-i netcfg/get_nameservers string {{ hostvars[hostname].network_cooked.nameservers | join(' ') }}
d-i netcfg/confirm_static boolean true
+d-i netcfg/hostname string {{ hostname }}
d-i netcfg/get_hostname string {{ hostname }}
d-i netcfg/get_hostname string {{ hostname }}
+d-i netcfg/domain string {{ hostvars[hostname].network_cooked.domain }}
d-i netcfg/get_domain string {{ hostvars[hostname].network_cooked.domain }}
d-i netcfg/wireless_wep string
d-i netcfg/get_domain string {{ hostvars[hostname].network_cooked.domain }}
d-i netcfg/wireless_wep string
diff --git
a/ansible/roles/preseed/templates/preseed_ubuntu-bionic.cfg.j2
b/ansible/roles/preseed/templates/preseed_ubuntu-bionic.cfg.j2
index
af6af41
..
be37537
100644
(file)
--- a/
ansible/roles/preseed/templates/preseed_ubuntu-bionic.cfg.j2
+++ b/
ansible/roles/preseed/templates/preseed_ubuntu-bionic.cfg.j2
@@
-22,7
+22,9
@@
d-i netcfg/get_gateway string {{ hostvars[hostname].network_cooked.primary.gatew
d-i netcfg/get_nameservers string {{ hostvars[hostname].network_cooked.nameservers | join(' ') }}
d-i netcfg/confirm_static boolean true
d-i netcfg/get_nameservers string {{ hostvars[hostname].network_cooked.nameservers | join(' ') }}
d-i netcfg/confirm_static boolean true
+d-i netcfg/hostname string {{ hostname }}
d-i netcfg/get_hostname string {{ hostname }}
d-i netcfg/get_hostname string {{ hostname }}
+d-i netcfg/domain string {{ hostvars[hostname].network_cooked.domain }}
d-i netcfg/get_domain string {{ hostvars[hostname].network_cooked.domain }}
d-i netcfg/wireless_wep string
d-i netcfg/get_domain string {{ hostvars[hostname].network_cooked.domain }}
d-i netcfg/wireless_wep string
diff --git
a/ansible/roles/preseed/templates/preseed_ubuntu-xenial.cfg.j2
b/ansible/roles/preseed/templates/preseed_ubuntu-xenial.cfg.j2
index
2872a29
..
73fe409
100644
(file)
--- a/
ansible/roles/preseed/templates/preseed_ubuntu-xenial.cfg.j2
+++ b/
ansible/roles/preseed/templates/preseed_ubuntu-xenial.cfg.j2
@@
-22,7
+22,9
@@
d-i netcfg/get_gateway string {{ hostvars[hostname].network_cooked.primary.gatew
d-i netcfg/get_nameservers string {{ hostvars[hostname].network_cooked.nameservers | join(' ') }}
d-i netcfg/confirm_static boolean true
d-i netcfg/get_nameservers string {{ hostvars[hostname].network_cooked.nameservers | join(' ') }}
d-i netcfg/confirm_static boolean true
+d-i netcfg/hostname string {{ hostname }}
d-i netcfg/get_hostname string {{ hostname }}
d-i netcfg/get_hostname string {{ hostname }}
+d-i netcfg/domain string {{ hostvars[hostname].network_cooked.domain }}
d-i netcfg/get_domain string {{ hostvars[hostname].network_cooked.domain }}
d-i netcfg/wireless_wep string
d-i netcfg/get_domain string {{ hostvars[hostname].network_cooked.domain }}
d-i netcfg/wireless_wep string