commit fa88c8913458a9e9c7bb6560dc82cb0a9d1b0e90
author Jenkins <jenkins@review.openstack.org> Tue Sep 22 13:01:47 2015 +0000
committer Gerrit Code Review <review@openstack.org> Tue Sep 22 13:01:47 2015 +0000
tree 751784729af5be2007a795e6e096de237f28b188
parent c9df10fcc00cc8c962d4961597300bcb90cdcd39
parent 54616845dfd0942164a67f69aef4e929d004d2d9

Merge "VMware: remove configuration integration_bridge from nova"

lib/nova_plugins/hypervisor-vsphere

diff --git a/lib/nova_plugins/hypervisor-vsphere b/lib/nova_plugins/hypervisor-vsphere
index c406e09..698f836 100644
--- a/lib/nova_plugins/hypervisor-vsphere
+++ b/lib/nova_plugins/hypervisor-vsphere
@@ -42,9 +42,6 @@
     iniset $NOVA_CONF vmware host_username "$VMWAREAPI_USER"
     iniset $NOVA_CONF vmware host_password "$VMWAREAPI_PASSWORD"
     iniset_multiline $NOVA_CONF vmware cluster_name "$VMWAREAPI_CLUSTER"
-    if is_service_enabled neutron; then
-        iniset $NOVA_CONF vmware integration_bridge $OVS_BRIDGE
-    fi
 }
 
 # install_nova_hypervisor() - Install external components