Browse code

Merge "VMware: remove configuration integration_bridge from nova"

Jenkins authored on 2015/09/22 22:01:47
Showing 1 changed files
... ...
@@ -42,9 +42,6 @@ function configure_nova_hypervisor {
42 42
     iniset $NOVA_CONF vmware host_username "$VMWAREAPI_USER"
43 43
     iniset $NOVA_CONF vmware host_password "$VMWAREAPI_PASSWORD"
44 44
     iniset_multiline $NOVA_CONF vmware cluster_name "$VMWAREAPI_CLUSTER"
45
-    if is_service_enabled neutron; then
46
-        iniset $NOVA_CONF vmware integration_bridge $OVS_BRIDGE
47
-    fi
48 45
 }
49 46
 
50 47
 # install_nova_hypervisor() - Install external components