openstack/openstack-ansible-os_neutron
Code Issues Proposed changes

Check length of network_mappings

Browse Source 
The OVS bridge creation logic for OVN deployments may fail
when the provider bridge has not been defined. This patch uses
logic that exists in the OVS deployment scenario to check the
length of neutron_provider_networks.network_mappings to ensure
a value has been set before attempting to create the bridge.

Change-Id: I34256e4ad22169ae6907a3c40270cb714cf33466
(cherry picked from commit 7c0ac931b0accd02f4c03b994dcaaa65a2b901ae)
This commit is contained in:
James Denton 2023-09-06 08:53:08 -05:00 committed by Dmitriy Rabotyagov
parent 36ae7cc97c
commit 7d6fd0887d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tasks/providers/setup_ovs_ovn.yml
View File

@ -62,7 +62,7 @@
loop_var: bridge_mapping loop_var: bridge_mapping
when: when:
- neutron_services['neutron-ovn-controller']['group'] in group_names - neutron_services['neutron-ovn-controller']['group'] in group_names
- neutron_provider_networks.network_mappings is defined - neutron_provider_networks.network_mappings is defined and (neutron_provider_networks.network_mappings|length > 0)
- name: Add ports to Network Provider Bridges - name: Add ports to Network Provider Bridges
openvswitch_port: openvswitch_port:
@ -79,7 +79,7 @@
- name: Set the OVN Bridge Mappings in OVS - name: Set the OVN Bridge Mappings in OVS
command: "ovs-vsctl set open . external-ids:ovn-bridge-mappings={{ neutron_provider_networks.network_mappings }}" command: "ovs-vsctl set open . external-ids:ovn-bridge-mappings={{ neutron_provider_networks.network_mappings }}"
when: when:
- neutron_provider_networks.network_mappings is defined - neutron_provider_networks.network_mappings is defined and (neutron_provider_networks.network_mappings|length > 0)
- neutron_services['neutron-ovn-controller']['group'] in group_names - neutron_services['neutron-ovn-controller']['group'] in group_names
- include_tasks: ovn_cluster_setup.yml - include_tasks: ovn_cluster_setup.yml