aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Nasiadka <mnasiadka@gmail.com>2024-12-06 09:44:23 +0100
committerMichal Nasiadka <mnasiadka@gmail.com>2024-12-06 09:44:58 +0100
commitccf1710b1b0c2362fa70ef55e03002b317f95fe4 (patch)
tree46cacad636408f62ad2f5ad1bfb6f1f20be0ddda
parent7f85beac3ff71a3660df5357f0136d722d64d519 (diff)
downloadkolla-ansible-ccf1710b1b0c2362fa70ef55e03002b317f95fe4.tar.gz
kolla-ansible-ccf1710b1b0c2362fa70ef55e03002b317f95fe4.zip
Replace ipaddr with ansible.utils.ipaddr
[DEPRECATION WARNING]: Filter "ansible.netcommon.ipaddr" has been deprecated. Use 'ansible.utils.ipaddr' module instead. This feature will be removed from ansible.netcommon in a release after 2024-01-01. Deprecation warnings can be disabled by setting deprecation_warnings=False in ansible.cfg. Change-Id: Ibcef3e642e5ff87aab6d8f73bda9860016cf715a
-rw-r--r--ansible/roles/loadbalancer/tasks/precheck.yml2
-rw-r--r--ansible/roles/ovs-dpdk/defaults/main.yml2
-rw-r--r--roles/multi-node-managed-addressing/tasks/main.yml2
3 files changed, 3 insertions, 3 deletions
diff --git a/ansible/roles/loadbalancer/tasks/precheck.yml b/ansible/roles/loadbalancer/tasks/precheck.yml
index b499c086b..c5c8d1ef1 100644
--- a/ansible/roles/loadbalancer/tasks/precheck.yml
+++ b/ansible/roles/loadbalancer/tasks/precheck.yml
@@ -219,7 +219,7 @@
changed_when: false
failed_when: >-
( ip_addr_output is failed or
- kolla_internal_vip_address | ipaddr(ip_addr_output.stdout.split()[3]) is none)
+ kolla_internal_vip_address | ansible.utils.ipaddr(ip_addr_output.stdout.split()[3]) is none)
check_mode: false
when:
- enable_haproxy | bool
diff --git a/ansible/roles/ovs-dpdk/defaults/main.yml b/ansible/roles/ovs-dpdk/defaults/main.yml
index b85b058c8..6df71dcac 100644
--- a/ansible/roles/ovs-dpdk/defaults/main.yml
+++ b/ansible/roles/ovs-dpdk/defaults/main.yml
@@ -42,7 +42,7 @@ ovs_bridge_mappings: "{{ neutron_physical_networks.split(',') | zip(neutron_brid
# Format: eth1:br1,eth2:br2
ovs_port_mappings: "{{ neutron_external_interface.split(',') | zip(neutron_bridge_name.split(',')) | map('join', ':') | join(',') }}"
tunnel_interface_network: "{{ hostvars[inventory_hostname].ansible_facts[dpdk_tunnel_interface]['ipv4']['network'] }}/{{ hostvars[inventory_hostname].ansible_facts[dpdk_tunnel_interface]['ipv4']['netmask'] }}"
-tunnel_interface_cidr: "{{ dpdk_tunnel_interface_address }}/{{ tunnel_interface_network | ipaddr('prefix') }}"
+tunnel_interface_cidr: "{{ dpdk_tunnel_interface_address }}/{{ tunnel_interface_network | ansible.utils.ipaddr('prefix') }}"
ovs_cidr_mappings: "{% if neutron_bridge_name.split(',') | length != 1 %} {neutron_bridge_name.split(',')[0]}:{{ tunnel_interface_cidr }} {% else %} {{ neutron_bridge_name }}:{{ tunnel_interface_cidr }} {% endif %}"
ovs_mem_channels: 4
ovs_socket_mem: 1024
diff --git a/roles/multi-node-managed-addressing/tasks/main.yml b/roles/multi-node-managed-addressing/tasks/main.yml
index 30753a0ab..dcf189905 100644
--- a/roles/multi-node-managed-addressing/tasks/main.yml
+++ b/roles/multi-node-managed-addressing/tasks/main.yml
@@ -20,7 +20,7 @@
# otherwise bifrost fails its pre-bootstrap sanity checks due to missing
# broadcast address as ansible picks up scope ('global') as the interface's
# broadcast address which fails checks logic
- managed_network_broadcast_address: "{{ managed_network_cidr | ipaddr('broadcast') }}"
+ managed_network_broadcast_address: "{{ managed_network_cidr | ansible.utils.ipaddr('broadcast') }}"
command: ip address add {{ managed_network_cidr }} broadcast {{ managed_network_broadcast_address }} dev {{ managed_interface_name }}
when: managed_network_address_family == 'ipv4'