diff options
Diffstat (limited to 'roles')
16 files changed, 33 insertions, 33 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 diff --git a/roles/installer/openbsd/autoinstall/templates/auto_install.conf.j2 b/roles/installer/openbsd/autoinstall/templates/auto_install.conf.j2 index e6437ff1..8c28d6e6 100644 --- a/roles/installer/openbsd/autoinstall/templates/auto_install.conf.j2 +++ b/roles/installer/openbsd/autoinstall/templates/auto_install.conf.j2 @@ -4,8 +4,8 @@ Which network interface do you wish to configure = {{ install_interface | defaul {% if (install_dhcp | default(false)) %} IPv4 address = dhcp {% else %} -IPv4 address = {{ network.primary.address | ipaddr('address') }} -Netmask = {{ network.primary.address | ipaddr('netmask') }} +IPv4 address = {{ network.primary.address | ansible.utils.ipaddr('address') }} +Netmask = {{ network.primary.address | ansible.utils.ipaddr('netmask') }} Default IPv4 route = {{ network.primary.gateway }} {% endif %} DNS domain name = {{ network.domain }} diff --git a/roles/network/dhcp-server/tasks/main.yml b/roles/network/dhcp-server/tasks/main.yml index f8733029..90183d9c 100644 --- a/roles/network/dhcp-server/tasks/main.yml +++ b/roles/network/dhcp-server/tasks/main.yml @@ -17,8 +17,8 @@ marker: '### {mark} ansible network/dhcp-server subnets ###' block: | {% for interface,subnet in dhcp_server_interfaces.items() %} - subnet {{ subnet.prefix | ipaddr('network') }} netmask {{ subnet.prefix | ipaddr('netmask') }} { - range {{ subnet.prefix | ipaddr(subnet.start) | ipaddr('address') }} {{ subnet.prefix | ipaddr(subnet.limit) | ipaddr('address') }}; + subnet {{ subnet.prefix | ansible.utils.ipaddr('network') }} netmask {{ subnet.prefix | ansible.utils.ipaddr('netmask') }} { + range {{ subnet.prefix | ansible.utils.ipaddr(subnet.start) | ansible.utils.ipaddr('address') }} {{ subnet.prefix | ansible.utils.ipaddr(subnet.limit) | ansible.utils.ipaddr('address') }}; {% if 'gateway' in subnet %} option routers {{ subnet.gateway }}; {% endif %} diff --git a/roles/vm/guest/network/tasks/OpenBSD.yml b/roles/vm/guest/network/tasks/OpenBSD.yml index ac31af55..d97b183b 100644 --- a/roles/vm/guest/network/tasks/OpenBSD.yml +++ b/roles/vm/guest/network/tasks/OpenBSD.yml @@ -7,7 +7,7 @@ copy: dest: "/etc/hostname.{{ interface.name }}" content: | - inet {{ interface.address | ipaddr('address') }} {{ interface.address | ipaddr('netmask') }} + inet {{ interface.address | ansible.utils.ipaddr('address') }} {{ interface.address | ansible.utils.ipaddr('netmask') }} {% for route in interface.static_routes | default([]) %} !route add -net {{ route.destination }} {{ route.gateway }} {% endfor %} diff --git a/roles/vm/guest/network/templates/interfaces/multihomed-base.j2 b/roles/vm/guest/network/templates/interfaces/multihomed-base.j2 index 3420dcf0..7ee46cd1 100644 --- a/roles/vm/guest/network/templates/interfaces/multihomed-base.j2 +++ b/roles/vm/guest/network/templates/interfaces/multihomed-base.j2 @@ -1,5 +1,5 @@ - address {{ interface.address | ipaddr('address') }} - netmask {{ interface.address | ipaddr('netmask') }} + address {{ interface.address | ansible.utils.ipaddr('address') }} + netmask {{ interface.address | ansible.utils.ipaddr('netmask') }} {% for route in interface.static_routes | default([]) %} up /bin/ip route add {{ route.destination }} via {{ route.gateway }}{% if 'source' in route %} src {{ route.source }}{% endif %}{% if 'table' in route %} table {{ route.table }}{% endif %}{{ '' }} {% endfor %} diff --git a/roles/vm/guest/network/templates/interfaces/multihomed-overlay.j2 b/roles/vm/guest/network/templates/interfaces/multihomed-overlay.j2 index 7ac94246..3fcfbcc7 100644 --- a/roles/vm/guest/network/templates/interfaces/multihomed-overlay.j2 +++ b/roles/vm/guest/network/templates/interfaces/multihomed-overlay.j2 @@ -1,12 +1,12 @@ - address {{ interface.address | ipaddr('address') }} - netmask {{ interface.address | ipaddr('netmask') }} + address {{ interface.address | ansible.utils.ipaddr('address') }} + netmask {{ interface.address | ansible.utils.ipaddr('netmask') }} {% for overlay in interface.overlays %} {% if 'name' in overlay %} ## {{ overlay.name }} {% endif %} up /bin/ip addr add dev $IFACE {{ overlay.address }} - up /bin/ip route add default via {{ overlay.gateway }} src {{ overlay.address | ipaddr('address') }} table {{ 200 + loop.index0 }} - up /bin/ip rule add pref {{ 40000 + loop.index0 }} from {{ overlay.address | ipaddr('address') }} lookup {{ 200 + loop.index0 }} + up /bin/ip route add default via {{ overlay.gateway }} src {{ overlay.address | ansible.utils.ipaddr('address') }} table {{ 200 + loop.index0 }} + up /bin/ip rule add pref {{ 40000 + loop.index0 }} from {{ overlay.address | ansible.utils.ipaddr('address') }} lookup {{ 200 + loop.index0 }} {% endfor %} ########## {% for overlay in interface.overlays | reverse %} @@ -14,6 +14,6 @@ ## {{ overlay.name }} {% endif %} down /bin/ip rule del pref {{ 40000 + loop.revindex0 }} - down /bin/ip route del default via {{ overlay.gateway }} src {{ overlay.address | ipaddr('address') }} table {{ 200 + loop.revindex0 }} + down /bin/ip route del default via {{ overlay.gateway }} src {{ overlay.address | ansible.utils.ipaddr('address') }} table {{ 200 + loop.revindex0 }} down /bin/ip addr del dev $IFACE {{ overlay.address }} {% endfor %} diff --git a/roles/vm/guest/network/templates/interfaces/overlay.j2 b/roles/vm/guest/network/templates/interfaces/overlay.j2 index b2ef11a9..b678150a 100644 --- a/roles/vm/guest/network/templates/interfaces/overlay.j2 +++ b/roles/vm/guest/network/templates/interfaces/overlay.j2 @@ -1,5 +1,5 @@ - address {{ interface.address | ipaddr('address') }} - netmask {{ interface.address | ipaddr('netmask') }} + address {{ interface.address | ansible.utils.ipaddr('address') }} + netmask {{ interface.address | ansible.utils.ipaddr('netmask') }} up /bin/ip addr add dev $IFACE {{ interface.overlay }}/32 {% for route in interface.static_routes | default([]) %} up /bin/ip route add {{ route.destination }} via {{ route.gateway }}{% if 'source' in route %} src {{ route.source }}{% endif %}{{ '' }} diff --git a/roles/vm/guest/network/templates/interfaces/simple.j2 b/roles/vm/guest/network/templates/interfaces/simple.j2 index 8d1bb83e..26e8aec2 100644 --- a/roles/vm/guest/network/templates/interfaces/simple.j2 +++ b/roles/vm/guest/network/templates/interfaces/simple.j2 @@ -1,5 +1,5 @@ - address {{ interface.address | ipaddr('address') }} - netmask {{ interface.address | ipaddr('netmask') }} + address {{ interface.address | ansible.utils.ipaddr('address') }} + netmask {{ interface.address | ansible.utils.ipaddr('netmask') }} {% if 'gateway' in interface %} gateway {{ interface.gateway }} {% endif %} diff --git a/roles/vm/host/network/templates/bridge-interfaces.j2 b/roles/vm/host/network/templates/bridge-interfaces.j2 index 426f91f8..0492c7f1 100644 --- a/roles/vm/host/network/templates/bridge-interfaces.j2 +++ b/roles/vm/host/network/templates/bridge-interfaces.j2 @@ -29,7 +29,7 @@ iface {{ bridge_name }} inet {{ ((matched | length) == 0) | ternary('manual', 's {% for overlay_name in (bridge.overlays | default({}) | list | sort) %} {% set overlay = bridge.overlays[overlay_name] %} {% for dest, offset in (overlay.offsets | dictsort(by='value')) %} - up /bin/ip route add {{ (overlay.prefix | ipaddr(offset)).split('/')[0] }}/32 via {{ (bridge.prefix | ipaddr(bridge.offsets[dest])).split('/')[0] }} # {{ dest }} + up /bin/ip route add {{ (overlay.prefix | ansible.utils.ipaddr(offset)).split('/')[0] }}/32 via {{ (bridge.prefix | ansible.utils.ipaddr(bridge.offsets[dest])).split('/')[0] }} # {{ dest }} {% endfor %} up /bin/ip route add unreachable {{ overlay.prefix }} down /sbin/ip route del {{ overlay.prefix }} diff --git a/roles/vm/host/network/templates/interfaces/simple.j2 b/roles/vm/host/network/templates/interfaces/simple.j2 index 8d1bb83e..26e8aec2 100644 --- a/roles/vm/host/network/templates/interfaces/simple.j2 +++ b/roles/vm/host/network/templates/interfaces/simple.j2 @@ -1,5 +1,5 @@ - address {{ interface.address | ipaddr('address') }} - netmask {{ interface.address | ipaddr('netmask') }} + address {{ interface.address | ansible.utils.ipaddr('address') }} + netmask {{ interface.address | ansible.utils.ipaddr('netmask') }} {% if 'gateway' in interface %} gateway {{ interface.gateway }} {% endif %} |