openstack/kolla-ansible
Code Issues Proposed changes

Replace ipaddr with ansible.utils.ipaddr

Browse Source 
[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
This commit is contained in:
Michal Nasiadka
2024-12-06 09:44:23 +01:00
parent 7f85beac3f
commit ccf1710b1b
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/loadbalancer/tasks/precheck.yml
View File

@@ -219,7 +219,7 @@
changed_when: false changed_when: false
failed_when: >- failed_when: >-
( ip_addr_output is failed or ( 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 check_mode: false
when: when:
- enable_haproxy | bool - enable_haproxy | bool

2
ansible/roles/ovs-dpdk/defaults/main.yml
View File

@@ -42,7 +42,7 @@ ovs_bridge_mappings: "{{ neutron_physical_networks.split(',') | zip(neutron_brid
# Format: eth1:br1,eth2:br2 # Format: eth1:br1,eth2:br2
ovs_port_mappings: "{{ neutron_external_interface.split(',') | zip(neutron_bridge_name.split(',')) | map('join', ':') | join(',') }}" 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_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_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_mem_channels: 4
ovs_socket_mem: 1024 ovs_socket_mem: 1024

2
roles/multi-node-managed-addressing/tasks/main.yml
View File

@@ -20,7 +20,7 @@
# otherwise bifrost fails its pre-bootstrap sanity checks due to missing # 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 as ansible picks up scope ('global') as the interface's
# broadcast address which fails checks logic # 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 }} command: ip address add {{ managed_network_cidr }} broadcast {{ managed_network_broadcast_address }} dev {{ managed_interface_name }}
when: managed_network_address_family == 'ipv4' when: managed_network_address_family == 'ipv4'