From e2a371a84d78230812db6912a290cedc5560ebed Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Tue, 6 Sep 2022 00:18:41 +0200 Subject: replace some more ipaddr() filter calls.. --- roles/network/openvpn/server/templates/client.j2 | 4 ++-- roles/network/openvpn/server/templates/conf.j2 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'roles/network/openvpn') diff --git a/roles/network/openvpn/server/templates/client.j2 b/roles/network/openvpn/server/templates/client.j2 index 0a0faf5f..1c77e457 100644 --- a/roles/network/openvpn/server/templates/client.j2 +++ b/roles/network/openvpn/server/templates/client.j2 @@ -1,4 +1,4 @@ -ifconfig-push {{ openvpn_zone.subnet | ipaddr(openvpn_zone.offsets[client]) | ipaddr('address') }} {{ openvpn_zone.subnet | ipaddr('netmask') }} +ifconfig-push {{ openvpn_zone.subnet | ansible.utils.ipaddr(openvpn_zone.offsets[client]) | ansible.utils.ipaddr('address') }} {{ openvpn_zone.subnet | ansible.utils.ipaddr('netmask') }} {% for route in (openvpn_zone.routes[client] | default([])) %} -iroute {{ route | ipaddr('network') }} {{ route | ipaddr('netmask') }} +iroute {{ route | ansible.utils.ipaddr('network') }} {{ route | ansible.utils.ipaddr('netmask') }} {% endfor %} diff --git a/roles/network/openvpn/server/templates/conf.j2 b/roles/network/openvpn/server/templates/conf.j2 index 7bfff141..cad82981 100644 --- a/roles/network/openvpn/server/templates/conf.j2 +++ b/roles/network/openvpn/server/templates/conf.j2 @@ -19,7 +19,7 @@ dev tun persist-tun topology subnet -ifconfig {{ openvpn_zone.subnet | ipaddr(openvpn_zone.offsets[inventory_hostname]) | ipaddr('address') }} {{ openvpn_zone.subnet | ipaddr('netmask') }} +ifconfig {{ openvpn_zone.subnet | ansible.utils.ipaddr(openvpn_zone.offsets[inventory_hostname]) | ansible.utils.ipaddr('address') }} {{ openvpn_zone.subnet | ansible.utils.ipaddr('netmask') }} push "topology subnet" client-config-dir {{ openvpn_zone.name }}-ccd/ ccd-exclusive @@ -27,6 +27,6 @@ ccd-exclusive ## static routes for client {{ client }} {% for route in routes %} -route {{ route | ipaddr('network') }} {{ route | ipaddr('netmask') }} {{ openvpn_zone.subnet | ipaddr(openvpn_zone.offsets[client]) | ipaddr('address') }} +route {{ route | ansible.utils.ipaddr('network') }} {{ route | ansible.utils.ipaddr('netmask') }} {{ openvpn_zone.subnet | ansible.utils.ipaddr(openvpn_zone.offsets[client]) | ansible.utils.ipaddr('address') }} {% endfor %} {% endfor %} -- cgit v1.2.3