diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2022-09-05 23:56:28 +0200 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2022-09-05 23:56:28 +0200 |
| commit | 0d20c36e23f2435edd3f4f362ae64963ca6bfb6a (patch) | |
| tree | 12859d4d39220b117fdf3ddc7a5b5d4c3edc086f /roles/installer/debian | |
| parent | ubuntu/installer: add support for desktop installs (diff) | |
replace some ipaddr() filter calls to new location (still a lot left todo...)
Diffstat (limited to 'roles/installer/debian')
7 files changed, 14 insertions, 14 deletions
diff --git a/roles/installer/debian/preseed/templates/preseed_debian-bullseye.cfg.j2 b/roles/installer/debian/preseed/templates/preseed_debian-bullseye.cfg.j2 index 8a298f33..30fa876b 100644 --- a/roles/installer/debian/preseed/templates/preseed_debian-bullseye.cfg.j2 +++ b/roles/installer/debian/preseed/templates/preseed_debian-bullseye.cfg.j2 @@ -21,8 +21,8 @@ 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 {{ network.primary.address | ipaddr('address') }} -d-i netcfg/get_netmask string {{ network.primary.address | ipaddr('netmask') }} +d-i netcfg/get_ipaddress string {{ network.primary.address | ansible.utils.ipaddr('address') }} +d-i netcfg/get_netmask string {{ network.primary.address | ansible.utils.ipaddr('netmask') }} d-i netcfg/get_gateway string {{ network.primary.gateway }} d-i netcfg/get_nameservers string {{ network.nameservers | join(' ') }} d-i netcfg/confirm_static boolean true diff --git a/roles/installer/debian/preseed/templates/preseed_debian-buster.cfg.j2 b/roles/installer/debian/preseed/templates/preseed_debian-buster.cfg.j2 index ece8d319..1fca669e 100644 --- a/roles/installer/debian/preseed/templates/preseed_debian-buster.cfg.j2 +++ b/roles/installer/debian/preseed/templates/preseed_debian-buster.cfg.j2 @@ -21,8 +21,8 @@ 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 {{ network.primary.address | ipaddr('address') }} -d-i netcfg/get_netmask string {{ network.primary.address | ipaddr('netmask') }} +d-i netcfg/get_ipaddress string {{ network.primary.address | ansible.utils.ipaddr('address') }} +d-i netcfg/get_netmask string {{ network.primary.address | ansible.utils.ipaddr('netmask') }} d-i netcfg/get_gateway string {{ network.primary.gateway }} d-i netcfg/get_nameservers string {{ network.nameservers | join(' ') }} d-i netcfg/confirm_static boolean true diff --git a/roles/installer/debian/preseed/templates/preseed_debian-jessie.cfg.j2 b/roles/installer/debian/preseed/templates/preseed_debian-jessie.cfg.j2 index 6ae6b5dd..43833b4e 100644 --- a/roles/installer/debian/preseed/templates/preseed_debian-jessie.cfg.j2 +++ b/roles/installer/debian/preseed/templates/preseed_debian-jessie.cfg.j2 @@ -21,8 +21,8 @@ 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 {{ network.primary.address | ipaddr('address') }} -d-i netcfg/get_netmask string {{ network.primary.address | ipaddr('netmask') }} +d-i netcfg/get_ipaddress string {{ network.primary.address | ansible.utils.ipaddr('address') }} +d-i netcfg/get_netmask string {{ network.primary.address | ansible.utils.ipaddr('netmask') }} d-i netcfg/get_gateway string {{ network.primary.gateway }} d-i netcfg/get_nameservers string {{ network.nameservers | join(' ') }} d-i netcfg/confirm_static boolean true diff --git a/roles/installer/debian/preseed/templates/preseed_debian-stretch.cfg.j2 b/roles/installer/debian/preseed/templates/preseed_debian-stretch.cfg.j2 index 37b0176f..048c9895 100644 --- a/roles/installer/debian/preseed/templates/preseed_debian-stretch.cfg.j2 +++ b/roles/installer/debian/preseed/templates/preseed_debian-stretch.cfg.j2 @@ -21,8 +21,8 @@ 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 {{ network.primary.address | ipaddr('address') }} -d-i netcfg/get_netmask string {{ network.primary.address | ipaddr('netmask') }} +d-i netcfg/get_ipaddress string {{ network.primary.address | ansible.utils.ipaddr('address') }} +d-i netcfg/get_netmask string {{ network.primary.address | ansible.utils.ipaddr('netmask') }} d-i netcfg/get_gateway string {{ network.primary.gateway }} d-i netcfg/get_nameservers string {{ network.nameservers | join(' ') }} d-i netcfg/confirm_static boolean true diff --git a/roles/installer/debian/preseed/templates/preseed_ubuntu-bionic.cfg.j2 b/roles/installer/debian/preseed/templates/preseed_ubuntu-bionic.cfg.j2 index 83c5209b..dd854161 100644 --- a/roles/installer/debian/preseed/templates/preseed_ubuntu-bionic.cfg.j2 +++ b/roles/installer/debian/preseed/templates/preseed_ubuntu-bionic.cfg.j2 @@ -25,8 +25,8 @@ 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 {{ network.primary.address | ipaddr('address') }} -d-i netcfg/get_netmask string {{ network.primary.address | ipaddr('netmask') }} +d-i netcfg/get_ipaddress string {{ network.primary.address | ansible.utils.ipaddr('address') }} +d-i netcfg/get_netmask string {{ network.primary.address | ansible.utils.ipaddr('netmask') }} d-i netcfg/get_gateway string {{ network.primary.gateway }} d-i netcfg/get_nameservers string {{ network.nameservers | join(' ') }} d-i netcfg/confirm_static boolean true diff --git a/roles/installer/debian/preseed/templates/preseed_ubuntu-focal.cfg.j2 b/roles/installer/debian/preseed/templates/preseed_ubuntu-focal.cfg.j2 index 716ba9c7..9295766f 100644 --- a/roles/installer/debian/preseed/templates/preseed_ubuntu-focal.cfg.j2 +++ b/roles/installer/debian/preseed/templates/preseed_ubuntu-focal.cfg.j2 @@ -25,8 +25,8 @@ 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 {{ network.primary.address | ipaddr('address') }} -d-i netcfg/get_netmask string {{ network.primary.address | ipaddr('netmask') }} +d-i netcfg/get_ipaddress string {{ network.primary.address | ansible.utils.ipaddr('address') }} +d-i netcfg/get_netmask string {{ network.primary.address | ansible.utils.ipaddr('netmask') }} d-i netcfg/get_gateway string {{ network.primary.gateway }} d-i netcfg/get_nameservers string {{ network.nameservers | join(' ') }} d-i netcfg/confirm_static boolean true 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 5a2b3ff0..0d5fe564 100644 --- a/roles/installer/debian/preseed/templates/preseed_ubuntu-xenial.cfg.j2 +++ b/roles/installer/debian/preseed/templates/preseed_ubuntu-xenial.cfg.j2 @@ -22,8 +22,8 @@ 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 {{ network.primary.address | ipaddr('address') }} -d-i netcfg/get_netmask string {{ network.primary.address | ipaddr('netmask') }} +d-i netcfg/get_ipaddress string {{ network.primary.address | ansible.utils.ipaddr('address') }} +d-i netcfg/get_netmask string {{ network.primary.address | ansible.utils.ipaddr('netmask') }} d-i netcfg/get_gateway string {{ network.primary.gateway }} d-i netcfg/get_nameservers string {{ network.nameservers | join(' ') }} d-i netcfg/confirm_static boolean true |