x/vmware-nsx
Code Issues Proposed changes

Skip configuring integration bride on ESXi compute

Browse Source 
Currently plugin code is trying to configute br-int has integration
bridge on esxi nova compute and stack is failing.

Change-Id: I19bf44bc92cb1a352b031e508134b9d545202c15
Co-Authored-By: Vishal Agarwal <vishala@vmware.com>
This commit is contained in:
Prashant Shetty 2017-03-13 09:22:07 +00:00
parent ab9da5df44
commit a9c8ffdd4d
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
devstack/lib/vmware_nsx_v3
View File

@ -80,11 +80,13 @@ function is_neutron_ovs_base_plugin {
}
function neutron_plugin_create_nova_conf {
# 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
if is_service_enabled n-cpu ; then
iniset $NOVA_CONF neutron ovs_bridge $OVS_BRIDGE
if [[ "$VIRT_DRIVER" -ne 'vsphere' ]]; 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
if is_service_enabled n-cpu ; then
iniset $NOVA_CONF neutron ovs_bridge $OVS_BRIDGE
fi
fi
fi
# if n-api is enabled, then setup the metadata_proxy_shared_secret