From 0d20c36e23f2435edd3f4f362ae64963ca6bfb6a Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Mon, 5 Sep 2022 23:56:28 +0200
Subject: replace some ipaddr() filter calls to new location (still a lot left
 todo...)

---
 roles/vm/guest/network/tasks/OpenBSD.yml                       |  2 +-
 roles/vm/guest/network/templates/interfaces/multihomed-base.j2 |  4 ++--
 .../guest/network/templates/interfaces/multihomed-overlay.j2   | 10 +++++-----
 roles/vm/guest/network/templates/interfaces/overlay.j2         |  4 ++--
 roles/vm/guest/network/templates/interfaces/simple.j2          |  4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'roles/vm/guest/network')

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 %}
-- 
cgit v1.2.3