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/ch-router.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'inventory/host_vars/ch-router.yml') diff --git a/inventory/host_vars/ch-router.yml b/inventory/host_vars/ch-router.yml index 640fadf1..197179d2 100644 --- a/inventory/host_vars/ch-router.yml +++ b/inventory/host_vars/ch-router.yml @@ -296,15 +296,15 @@ openwrt_uci: options: device: eth0 proto: static - ipaddr: "{{ network_zones.svc.prefix | ipaddr(network_zones.svc.offsets[inventory_hostname]) | ipaddr('address') }}" - netmask: "{{ network_zones.svc.prefix | ipaddr('netmask') }}" + ipaddr: "{{ network_zones.svc.prefix | ansible.utils.ipaddr(network_zones.svc.offsets[inventory_hostname]) | ansible.utils.ipaddr('address') }}" + netmask: "{{ network_zones.svc.prefix | ansible.utils.ipaddr('netmask') }}" - name: interface 'magenta' options: device: eth1 proto: static - ipaddr: "{{ network_zones.magenta.prefix | ipaddr(network_zones.magenta.offsets[inventory_hostname]) | ipaddr('address') }}" - netmask: "{{ network_zones.magenta.prefix | ipaddr('netmask') }}" + ipaddr: "{{ network_zones.magenta.prefix | ansible.utils.ipaddr(network_zones.magenta.offsets[inventory_hostname]) | ansible.utils.ipaddr('address') }}" + netmask: "{{ network_zones.magenta.prefix | ansible.utils.ipaddr('netmask') }}" gateway: "{{ network_zones.magenta.gateway }}" dns: "{{ network_zones.magenta.dns }}" @@ -312,15 +312,15 @@ openwrt_uci: options: device: eth2 proto: static - ipaddr: "{{ network_zones.mgmt.prefix | ipaddr(network_zones.mgmt.offsets[inventory_hostname]) | ipaddr('address') }}" - netmask: "{{ network_zones.mgmt.prefix | ipaddr('netmask') }}" + ipaddr: "{{ network_zones.mgmt.prefix | ansible.utils.ipaddr(network_zones.mgmt.offsets[inventory_hostname]) | ansible.utils.ipaddr('address') }}" + netmask: "{{ network_zones.mgmt.prefix | ansible.utils.ipaddr('netmask') }}" - name: route 'lan' options: interface: svc - target: "{{ network_zones.lan.prefix | ipaddr('network') }}" - netmask: "{{ network_zones.lan.prefix | ipaddr('netmask') }}" - gateway: "{{ network_zones.svc.prefix | ipaddr(network_zones.svc.offsets['ch-gw-lan']) | ipaddr('address') }}" + target: "{{ network_zones.lan.prefix | ansible.utils.ipaddr('network') }}" + netmask: "{{ network_zones.lan.prefix | ansible.utils.ipaddr('netmask') }}" + gateway: "{{ network_zones.svc.prefix | ansible.utils.ipaddr(network_zones.svc.offsets['ch-gw-lan']) | ansible.utils.ipaddr('address') }}" sqm: - name: queue 'magenta' @@ -341,6 +341,6 @@ openwrt_uci: overhead: '18 mpu 64 noatm' -prometheus_scrape_endpoint: "{{ network_zones.mgmt.prefix | ipaddr(network_zones.mgmt.offsets[inventory_hostname]) | ipaddr('address') }}:9100" +prometheus_scrape_endpoint: "{{ network_zones.mgmt.prefix | ansible.utils.ipaddr(network_zones.mgmt.offsets[inventory_hostname]) | ansible.utils.ipaddr('address') }}:9100" prometheus_exporters_default: - openwrt -- cgit v1.2.3