x/vmware-nsx
Code Issues Proposed changes

Merge "NSX|V3: ensure bridge is created if octavia is running"

Browse Source
This commit is contained in:
Jenkins 2016-12-06 14:27:23 +00:00 committed by Gerrit Code Review
commit 11fdde704f
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
devstack/lib/vmware_nsx_v3
View File

@ -75,11 +75,13 @@ function is_neutron_ovs_base_plugin {
} }
function neutron_plugin_create_nova_conf { function neutron_plugin_create_nova_conf {
# if n-cpu is enabled, then setup integration bridge # if n-cpu or octavia is enabled, then setup integration bridge
if is_service_enabled n-cpu; then if is_service_enabled n-cpu || is_service_enabled octavia ; then
setup_integration_bridge setup_integration_bridge
if is_service_enabled n-cpu ; then
iniset $NOVA_CONF neutron ovs_bridge $OVS_BRIDGE iniset $NOVA_CONF neutron ovs_bridge $OVS_BRIDGE
fi fi
fi
# if n-api is enabled, then setup the metadata_proxy_shared_secret # if n-api is enabled, then setup the metadata_proxy_shared_secret
if is_service_enabled n-api; then if is_service_enabled n-api; then
iniset $NOVA_CONF neutron service_metadata_proxy True iniset $NOVA_CONF neutron service_metadata_proxy True