summaryrefslogtreecommitdiff
path: root/roles/vm/host
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2022-09-05 23:56:28 +0200
committerChristian Pointner <equinox@spreadspace.org>2022-09-05 23:56:28 +0200
commit0d20c36e23f2435edd3f4f362ae64963ca6bfb6a (patch)
tree12859d4d39220b117fdf3ddc7a5b5d4c3edc086f /roles/vm/host
parentubuntu/installer: add support for desktop installs (diff)
replace some ipaddr() filter calls to new location (still a lot left todo...)
Diffstat (limited to 'roles/vm/host')
-rw-r--r--roles/vm/host/network/templates/bridge-interfaces.j22
-rw-r--r--roles/vm/host/network/templates/interfaces/simple.j24
2 files changed, 3 insertions, 3 deletions
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 %}