From cacb62267e536d125afa6954d41202cf0e7f1310 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Tue, 6 Sep 2022 01:51:50 +0200 Subject: replace some more ipaddr() filter calls (cont'd) --- inventory/host_vars/ele-router-emc.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'inventory/host_vars/ele-router-emc.yml') diff --git a/inventory/host_vars/ele-router-emc.yml b/inventory/host_vars/ele-router-emc.yml index 5c159ff9..7384cb20 100644 --- a/inventory/host_vars/ele-router-emc.yml +++ b/inventory/host_vars/ele-router-emc.yml @@ -11,8 +11,8 @@ openwrt_network_external: options: device: 'eth5' proto: static - ipaddr: "{{ network_zones.cc_hmtsaal.prefix | ipaddr(network_zones.cc_hmtsaal.offsets[inventory_hostname]) | ipaddr('address') }}" - netmask: "{{ network_zones.cc_hmtsaal.prefix | ipaddr('netmask') }}" + ipaddr: "{{ network_zones.cc_hmtsaal.prefix | ansible.utils.ipaddr(network_zones.cc_hmtsaal.offsets[inventory_hostname]) | ansible.utils.ipaddr('address') }}" + netmask: "{{ network_zones.cc_hmtsaal.prefix | ansible.utils.ipaddr('netmask') }}" gateway: "{{ network_zones.cc_hmtsaal.gateway }}" dns: "{{ network_zones.cc_hmtsaal.dns }}" accept_ra: 0 @@ -25,7 +25,7 @@ openwrt_network_internal_yaml: | device: "eth0.{{ network_zones[zone_name].vlan }}" proto: static ipaddr: "{{ network_zones[zone_name].gateway }}" - netmask: "{{ network_zones[zone_name].prefix | ipaddr('netmask') }}" + netmask: "{{ network_zones[zone_name].prefix | ansible.utils.ipaddr('netmask') }}" accept_ra: 0 {% endfor %} @@ -46,8 +46,8 @@ openwrt_network_base: options: device: "eth0.{{ network_mgmt_zone.vlan }}" proto: static - ipaddr: "{{ network_mgmt_zone.prefix | ipaddr(network_mgmt_zone.offsets[inventory_hostname]) | ipaddr('address') }}" - netmask: "{{ network_mgmt_zone.prefix | ipaddr('netmask') }}" + ipaddr: "{{ network_mgmt_zone.prefix | ansible.utils.ipaddr(network_mgmt_zone.offsets[inventory_hostname]) | ansible.utils.ipaddr('address') }}" + netmask: "{{ network_mgmt_zone.prefix | ansible.utils.ipaddr('netmask') }}" accept_ra: 0 @@ -176,7 +176,7 @@ openwrt_mixin: flush ruleset define nic_citycom = eth5 - define ip_citycom = {{ network_zones.cc_hmtsaal.prefix | ipaddr(network_zones.cc_hmtsaal.offsets[inventory_hostname]) | ipaddr('address') }} + define ip_citycom = {{ network_zones.cc_hmtsaal.prefix | ansible.utils.ipaddr(network_zones.cc_hmtsaal.offsets[inventory_hostname]) | ansible.utils.ipaddr('address') }} define nic_mgmt = "eth0.{{ network_mgmt_zone.vlan }}" define prefix_mgmt = {{ network_mgmt_zone.prefix }} @@ -260,6 +260,6 @@ openwrt_uci: network: "{{ openwrt_network_base + openwrt_network_internal + openwrt_network_external }}" -prometheus_scrape_endpoint: "{{ network_mgmt_zone.prefix | ipaddr(network_mgmt_zone.offsets[inventory_hostname]) | ipaddr('address') }}:9100" +prometheus_scrape_endpoint: "{{ network_mgmt_zone.prefix | ansible.utils.ipaddr(network_mgmt_zone.offsets[inventory_hostname]) | ansible.utils.ipaddr('address') }}:9100" prometheus_exporters_default: - openwrt -- cgit v1.2.3