From aa5b54ea857641b516de1a70778cb26e41b6c438 Mon Sep 17 00:00:00 2001 From: Gary Kotton Date: Tue, 22 Nov 2016 07:52:42 -0800 Subject: [PATCH] NSX|V3: ensure bridge is created if octavia is running Ensure that devstack works if nova -compute is running on another host and ocatiav is on the controoler. The integration bridge needs to be created and managed on the controller. Change-Id: Id838f2e7f5334885e72442e190d3a815ae859173 --- devstack/lib/vmware_nsx_v3 | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/devstack/lib/vmware_nsx_v3 b/devstack/lib/vmware_nsx_v3 index 24a7dfa5e3..ea807b7bfd 100644 --- a/devstack/lib/vmware_nsx_v3 +++ b/devstack/lib/vmware_nsx_v3 @@ -71,10 +71,12 @@ function is_neutron_ovs_base_plugin { } function neutron_plugin_create_nova_conf { - # if n-cpu is enabled, then setup integration bridge - if is_service_enabled n-cpu; then + # if n-cpu or octavia is enabled, then setup integration bridge + if is_service_enabled n-cpu || is_service_enabled octavia ; then setup_integration_bridge - iniset $NOVA_CONF neutron ovs_bridge $OVS_BRIDGE + if is_service_enabled n-cpu ; then + iniset $NOVA_CONF neutron ovs_bridge $OVS_BRIDGE + fi fi # if n-api is enabled, then setup the metadata_proxy_shared_secret if is_service_enabled n-api; then