From 7d6fd0887d76ce8188ace2f276123c6893e10e7c Mon Sep 17 00:00:00 2001 From: James Denton Date: Wed, 6 Sep 2023 08:53:08 -0500 Subject: [PATCH] Check length of network_mappings 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) --- tasks/providers/setup_ovs_ovn.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tasks/providers/setup_ovs_ovn.yml b/tasks/providers/setup_ovs_ovn.yml index 2302fee7..7dbc4519 100644 --- a/tasks/providers/setup_ovs_ovn.yml +++ b/tasks/providers/setup_ovs_ovn.yml @@ -62,7 +62,7 @@ loop_var: bridge_mapping when: - 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 openvswitch_port: @@ -79,7 +79,7 @@ - name: Set the OVN Bridge Mappings in OVS command: "ovs-vsctl set open . external-ids:ovn-bridge-mappings={{ neutron_provider_networks.network_mappings }}" 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 - include_tasks: ovn_cluster_setup.yml