12 files changed, 23 insertions, 23 deletions
diff --git a/inventory/group_vars/accesspoints/vars.yml b/inventory/group_vars/accesspoints/vars.yml
index c514a22f..18807870 100644
--- a/inventory/group_vars/accesspoints/vars.yml
+++ b/inventory/group_vars/accesspoints/vars.yml
@@ -41,7 +41,7 @@ accesspoint_network_base_yaml: |
       device: "{{ accesspoint_wired_interface }}{% if 'vlan' in network_mgmt_zone %}.{{ network_mgmt_zone.vlan }}{% endif %}"
       accept_ra: 0
       proto: static
-      ipaddr: "{{ network_mgmt_zone.prefix | ipaddr(network_mgmt_zone.offsets[inventory_hostname]) }}"
+      ipaddr: "{{ network_mgmt_zone.prefix | ansible.utils.ipaddr(network_mgmt_zone.offsets[inventory_hostname]) }}"
 
 
 accesspoint_network_zones: "{{ accesspoint_network_zones_yaml | from_yaml }}"
diff --git a/inventory/group_vars/chaos-at-home-ap/vars.yml b/inventory/group_vars/chaos-at-home-ap/vars.yml
index fce6fc82..83925639 100644
--- a/inventory/group_vars/chaos-at-home-ap/vars.yml
+++ b/inventory/group_vars/chaos-at-home-ap/vars.yml
@@ -15,6 +15,6 @@ accesspoint_zones:
   iot: "{{ network_zones.iot.wifi }}"
 
 
-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
diff --git a/inventory/group_vars/chaos-at-home-sensors/vars.yml b/inventory/group_vars/chaos-at-home-sensors/vars.yml
index 91bed8ce..d6783736 100644
--- a/inventory/group_vars/chaos-at-home-sensors/vars.yml
+++ b/inventory/group_vars/chaos-at-home-sensors/vars.yml
@@ -83,7 +83,7 @@ openwrt_uci:
         enabled: '1'
         enable_server: '0'
         server:
-          - '{{ network_zones.iot.prefix | ipaddr(network_zones.iot.offsets["ch-iot"]) | ipaddr("address") }}'
+          - '{{ network_zones.iot.prefix | ansible.utils.ipaddr(network_zones.iot.offsets["ch-iot"]) | ansible.utils.ipaddr("address") }}'
 
   dropbear:
     - name: dropbear
@@ -115,8 +115,8 @@ openwrt_uci:
       options:
         device: "{{ sensornode_network_wired | ternary('eth0', 'wlan0') }}"
         proto: static
-        ipaddr: "{{ network_zones.iot.prefix | ipaddr(network_zones.iot.offsets[inventory_hostname]) | ipaddr('address') }}"
-        netmask: "{{ network_zones.iot.prefix | ipaddr('netmask') }}"
+        ipaddr: "{{ network_zones.iot.prefix | ansible.utils.ipaddr(network_zones.iot.offsets[inventory_hostname]) | ansible.utils.ipaddr('address') }}"
+        netmask: "{{ network_zones.iot.prefix | ansible.utils.ipaddr('netmask') }}"
 
     - name: interface 'unused'
       options:
@@ -143,6 +143,6 @@ openwrt_uci:
         key: '{{ network_zones.iot.wifi.key }}'
 
 
-prometheus_scrape_endpoint: "{{ network_zones.iot.prefix | ipaddr(network_zones.iot.offsets[inventory_hostname]) | ipaddr('address') }}:9100"
+prometheus_scrape_endpoint: "{{ network_zones.iot.prefix | ansible.utils.ipaddr(network_zones.iot.offsets[inventory_hostname]) | ansible.utils.ipaddr('address') }}:9100"
 prometheus_exporters_default:
   - openwrt
diff --git a/inventory/group_vars/chaos-at-home-ups/vars.yml b/inventory/group_vars/chaos-at-home-ups/vars.yml
index 7b60e893..2a67bb76 100644
--- a/inventory/group_vars/chaos-at-home-ups/vars.yml
+++ b/inventory/group_vars/chaos-at-home-ups/vars.yml
@@ -3,11 +3,11 @@ network_mgmt_zone: "{{ network_zones.mgmt }}"
 
 ups_name: "{{ inventory_hostname | regex_replace('^ch-ups-(.*)$', '\\1') }}"
 ups_query_sources:
-  - "{{ network_mgmt_zone.prefix | ipaddr(network_mgmt_zone.offsets['ch-mon']) | ipaddr('address') }}"
-  - "{{ network_mgmt_zone.prefix | ipaddr(network_mgmt_zone.offsets['ch-equinox-ws']) | ipaddr('address') }}"
+  - "{{ network_mgmt_zone.prefix | ansible.utils.ipaddr(network_mgmt_zone.offsets['ch-mon']) | ansible.utils.ipaddr('address') }}"
+  - "{{ network_mgmt_zone.prefix | ansible.utils.ipaddr(network_mgmt_zone.offsets['ch-equinox-ws']) | ansible.utils.ipaddr('address') }}"
 
 
-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
 
@@ -15,4 +15,4 @@ prometheus_job_multitarget_nut__ups:
   ch-mon:
   - instance: "ups-{{ ups_name }}"
     ups: "{{ ups_name }}"
-    server: "{{ network_mgmt_zone.prefix | ipaddr(network_mgmt_zone.offsets[inventory_hostname]) | ipaddr('address') }}"
+    server: "{{ network_mgmt_zone.prefix | ansible.utils.ipaddr(network_mgmt_zone.offsets[inventory_hostname]) | ansible.utils.ipaddr('address') }}"
diff --git a/inventory/group_vars/dellos6/vars.yml b/inventory/group_vars/dellos6/vars.yml
index 29c4c0db..46737717 100644
--- a/inventory/group_vars/dellos6/vars.yml
+++ b/inventory/group_vars/dellos6/vars.yml
@@ -7,8 +7,8 @@ ansible_become_password: "{{ vault_ansible_become_password }}"
 
 
 dellos6_mgmt_vlan: "{{ switch_mgmt_zone.vlan }}"
-dellos6_mgmt_ipaddr: "{{ switch_mgmt_zone.prefix | ipaddr(switch_mgmt_zone.offsets[inventory_hostname]) | ipaddr('address') }}"
-dellos6_mgmt_netmask: "{{ switch_mgmt_zone.prefix | ipaddr('netmask') }}"
+dellos6_mgmt_ipaddr: "{{ switch_mgmt_zone.prefix | ansible.utils.ipaddr(switch_mgmt_zone.offsets[inventory_hostname]) | ansible.utils.ipaddr('address') }}"
+dellos6_mgmt_netmask: "{{ switch_mgmt_zone.prefix | ansible.utils.ipaddr('netmask') }}"
 dellos6_mgmt_interface: "{{ switch_mgmt_interface | default('') }}"
 
 dellos6_vlans: "{{ switch_vlans }}"
diff --git a/inventory/group_vars/ele-ap/vars.yml b/inventory/group_vars/ele-ap/vars.yml
index 94034dbf..732c6b03 100644
--- a/inventory/group_vars/ele-ap/vars.yml
+++ b/inventory/group_vars/ele-ap/vars.yml
@@ -59,6 +59,6 @@ accesspoint_zones:
   infoscreens: "{{ network_zones.infoscreens.wifi }}"
 
 
-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
diff --git a/inventory/group_vars/ele-dolmetsch-raspi/vars.yml b/inventory/group_vars/ele-dolmetsch-raspi/vars.yml
index 3dcce239..e987b1ab 100644
--- a/inventory/group_vars/ele-dolmetsch-raspi/vars.yml
+++ b/inventory/group_vars/ele-dolmetsch-raspi/vars.yml
@@ -10,8 +10,8 @@ ssh_users_root:
   - datacop
   - nhg
 
-dolmetsch_raspi_server_address: "{{ network_zones.mixer.prefix | ipaddr(network_zones.mixer.offsets['ele-dol-raspi0']) | ipaddr('address') }}"
-dolmetsch_raspi_client_address: "{{ network_zones.mixer.prefix | ipaddr(network_zones.mixer.offsets['ele-dol-raspi1']) | ipaddr('address') }}"
+dolmetsch_raspi_server_address: "{{ network_zones.mixer.prefix | ansible.utils.ipaddr(network_zones.mixer.offsets['ele-dol-raspi0']) | ansible.utils.ipaddr('address') }}"
+dolmetsch_raspi_client_address: "{{ network_zones.mixer.prefix | ansible.utils.ipaddr(network_zones.mixer.offsets['ele-dol-raspi1']) | ansible.utils.ipaddr('address') }}"
 
 # dolmetsch_raspi_recv_latency: 2000
 dolmetsch_raspi_send_alsa_device: "hw:CARD=CODEC,DEV=0"
diff --git a/inventory/group_vars/ele-ups/vars.yml b/inventory/group_vars/ele-ups/vars.yml
index dfbeaaca..20fda933 100644
--- a/inventory/group_vars/ele-ups/vars.yml
+++ b/inventory/group_vars/ele-ups/vars.yml
@@ -7,10 +7,10 @@ network_mgmt_zone: "{{ network_zones.mgmt }}"
 
 ups_name: "{{ inventory_hostname | regex_replace('^ele-ups-(.*)$', '\\1') }}"
 ups_query_sources:
-  - "{{ network_mgmt_zone.prefix | ipaddr(network_mgmt_zone.offsets['ele-calypso']) | ipaddr('address') }}"
+  - "{{ network_mgmt_zone.prefix | ansible.utils.ipaddr(network_mgmt_zone.offsets['ele-calypso']) | ansible.utils.ipaddr('address') }}"
 
 
-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
 
@@ -18,4 +18,4 @@ prometheus_job_multitarget_nut__ups:
   ele-calypso:
   - instance: "ups-{{ ups_name }}"
     ups: "{{ ups_name }}"
-    server: "{{ network_mgmt_zone.prefix | ipaddr(network_mgmt_zone.offsets[inventory_hostname]) | ipaddr('address') }}"
+    server: "{{ network_mgmt_zone.prefix | ansible.utils.ipaddr(network_mgmt_zone.offsets[inventory_hostname]) | ansible.utils.ipaddr('address') }}"
diff --git a/inventory/group_vars/k8s-emc/vars.yml b/inventory/group_vars/k8s-emc/vars.yml
index 49225f74..599eaf3a 100644
--- a/inventory/group_vars/k8s-emc/vars.yml
+++ b/inventory/group_vars/k8s-emc/vars.yml
@@ -48,7 +48,7 @@ kubeguard:
         ele-telesto: enp36s0
         ele-dione: eno2
 
-kubernetes_overlay_node_ip: "{{ kubernetes.pod_ip_range | ipsubnet(kubernetes.pod_ip_range_size, kubeguard.node_index[inventory_hostname]) | ipaddr(1) | ipaddr('address') }}"
+kubernetes_overlay_node_ip: "{{ kubernetes.pod_ip_range | ipsubnet(kubernetes.pod_ip_range_size, kubeguard.node_index[inventory_hostname]) | ansible.utils.ipaddr(1) | ansible.utils.ipaddr('address') }}"
 
 kubernetes_metrics_server_version: 0.6.1
 
diff --git a/inventory/group_vars/promzone-chaos-at-home/vars.yml b/inventory/group_vars/promzone-chaos-at-home/vars.yml
index 9a132c39..0d4d8354 100644
--- a/inventory/group_vars/promzone-chaos-at-home/vars.yml
+++ b/inventory/group_vars/promzone-chaos-at-home/vars.yml
@@ -1,5 +1,5 @@
 ---
-prometheus_scrape_endpoint: "{{ network.primary.address | ipaddr('address') }}:9999"
+prometheus_scrape_endpoint: "{{ network.primary.address | ansible.utils.ipaddr('address') }}:9999"
 
 prometheus_exporters_extra: []
 prometheus_exporters_default:
diff --git a/inventory/group_vars/promzone-elevate-festival/vars.yml b/inventory/group_vars/promzone-elevate-festival/vars.yml
index 48c745e8..08b7a0d3 100644
--- a/inventory/group_vars/promzone-elevate-festival/vars.yml
+++ b/inventory/group_vars/promzone-elevate-festival/vars.yml
@@ -1,5 +1,5 @@
 ---
-prometheus_scrape_endpoint: "{{ network.primary.address | ipaddr('address') }}:9999"
+prometheus_scrape_endpoint: "{{ network.primary.address | ansible.utils.ipaddr('address') }}:9999"
 
 prometheus_exporters_extra: []
 prometheus_exporters_default:
diff --git a/inventory/group_vars/ups/vars.yml b/inventory/group_vars/ups/vars.yml
index 2e75f882..99328aec 100644
--- a/inventory/group_vars/ups/vars.yml
+++ b/inventory/group_vars/ups/vars.yml
@@ -109,8 +109,8 @@ openwrt_uci:
       options:
         device: "eth0"
         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
 
   prometheus-node-exporter-lua: