diff options
| author | Zuul <zuul@review.opendev.org> | 2025-04-16 16:25:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2025-04-16 16:25:25 +0000 |
| commit | 5e74421fcc1c24df3bbe88c5c1aa7a3d92066f79 (patch) | |
| tree | e453c9713995834a249d6f68342de68cc93252d6 | |
| parent | 421237f8571336f5532f7532755c20c67d1a46ef (diff) | |
| parent | ccf1710b1b0c2362fa70ef55e03002b317f95fe4 (diff) | |
| download | kolla-ansible-5e74421fcc1c24df3bbe88c5c1aa7a3d92066f79.tar.gz kolla-ansible-5e74421fcc1c24df3bbe88c5c1aa7a3d92066f79.zip | |
Merge "Replace ipaddr with ansible.utils.ipaddr"
| -rw-r--r-- | ansible/roles/loadbalancer/tasks/precheck.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/ovs-dpdk/defaults/main.yml | 2 | ||||
| -rw-r--r-- | roles/multi-node-managed-addressing/tasks/main.yml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/ansible/roles/loadbalancer/tasks/precheck.yml b/ansible/roles/loadbalancer/tasks/precheck.yml index 3cdb452d2..ef13df2b2 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' |