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
This commit is contained in:
Gary Kotton 2016-11-22 07:52:42 -08:00
parent a951f5f929
commit aa5b54ea85
1 changed files with 5 additions and 3 deletions

View File

@ -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