Skip to content

Commit 973d37f

Browse files
mnasiadkaAlex-Welsh
authored andcommitted
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. Closes-Bug: #2108313 Change-Id: Ibcef3e642e5ff87aab6d8f73bda9860016cf715a (cherry picked from commit ccf1710)
1 parent a0a2d05 commit 973d37f

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

ansible/roles/loadbalancer/tasks/precheck.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@
193193
changed_when: false
194194
failed_when: >-
195195
( ip_addr_output is failed or
196-
kolla_internal_vip_address | ipaddr(ip_addr_output.stdout.split()[3]) is none)
196+
kolla_internal_vip_address | ansible.utils.ipaddr(ip_addr_output.stdout.split()[3]) is none)
197197
check_mode: false
198198
when:
199199
- enable_haproxy | bool

ansible/roles/ovs-dpdk/defaults/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ ovsdpdk_services:
4040
ovs_bridge_mappings: "{% for bridge in neutron_bridge_name.split(',') %}physnet{{ loop.index0 + 1 }}:{{ bridge }}{% if not loop.last %},{% endif %}{% endfor %}"
4141
ovs_port_mappings: "{% for bridge in neutron_bridge_name.split(',') %} {{ neutron_external_interface.split(',')[loop.index0] }}:{{ bridge }}{% if not loop.last %},{% endif %}{% endfor %}"
4242
tunnel_interface_network: "{{ hostvars[inventory_hostname].ansible_facts[dpdk_tunnel_interface]['ipv4']['network'] }}/{{ hostvars[inventory_hostname].ansible_facts[dpdk_tunnel_interface]['ipv4']['netmask'] }}"
43-
tunnel_interface_cidr: "{{ dpdk_tunnel_interface_address }}/{{ tunnel_interface_network | ipaddr('prefix') }}"
43+
tunnel_interface_cidr: "{{ dpdk_tunnel_interface_address }}/{{ tunnel_interface_network | ansible.utils.ipaddr('prefix') }}"
4444
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 %}"
4545
ovs_mem_channels: 4
4646
ovs_socket_mem: 1024

roles/multi-node-managed-addressing/tasks/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
# otherwise bifrost fails its pre-bootstrap sanity checks due to missing
2121
# broadcast address as ansible picks up scope ('global') as the interface's
2222
# broadcast address which fails checks logic
23-
managed_network_broadcast_address: "{{ managed_network_cidr | ipaddr('broadcast') }}"
23+
managed_network_broadcast_address: "{{ managed_network_cidr | ansible.utils.ipaddr('broadcast') }}"
2424
command: ip address add {{ managed_network_cidr }} broadcast {{ managed_network_broadcast_address }} dev {{ managed_interface_name }}
2525
when: managed_network_address_family == 'ipv4'
2626

0 commit comments

Comments
 (0)