diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2020-06-22 02:37:11 +0200 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2020-06-22 02:37:11 +0200 |
| commit | 5a35c210ddb64998586b69b921e8d721395f09d5 (patch) | |
| tree | 9a65e26f147c59ab379e1cd23a1baf60ac5d5264 /roles/installer/debian/preseed/templates/preseed_ubuntu-xenial.cfg.j2 | |
| parent | Merge branch 'topic/kubernetes-network-plugins' (diff) | |
| parent | converted other physical machines to new network config (diff) | |
Merge branch 'topic/network-interfaces-variables-refactoring'
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.j2 | 6 |
1 files changed, 3 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 bb510710..cdb5f966 100644 --- a/roles/installer/debian/preseed/templates/preseed_ubuntu-xenial.cfg.j2 +++ b/roles/installer/debian/preseed/templates/preseed_ubuntu-xenial.cfg.j2 @@ -13,15 +13,15 @@ d-i keyboard-configuration/layoutcode string us d-i hw-detect/load_firmware boolean false -d-i netcfg/choose_interface select {{ install_interface | default(hostvars[install_hostname].network_cooked.primary.interface) }} +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/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.ip }} -d-i netcfg/get_netmask string {{ hostvars[install_hostname].network_cooked.primary.mask }} +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/confirm_static boolean true |