commit fd2e82bda2e4e02fc55cbcb124439e3399a8f90e
author Jenkins <jenkins@review.openstack.org> Mon Jul 15 14:03:48 2013 +0000
committer Gerrit Code Review <review@openstack.org> Mon Jul 15 14:03:48 2013 +0000
tree 84d0651128e19412498b4691bf1cd9e178e558b7
parent c701189b4de6479ae7ccd12e359ffa400c9fbc89
parent be677f4403f69f03b3719661ceed71c34bf431a6

Merge "Add integration bridge to the nova.conf"

stack.sh

diff --git a/stack.sh b/stack.sh
index e2cdb7b..f2054d9 100755
--- a/stack.sh
+++ b/stack.sh
@@ -1081,7 +1081,9 @@
         iniset $NOVA_CONF DEFAULT vmwareapi_host_username "$VMWAREAPI_USER"
         iniset $NOVA_CONF DEFAULT vmwareapi_host_password "$VMWAREAPI_PASSWORD"
         iniset $NOVA_CONF DEFAULT vmwareapi_cluster_name "$VMWAREAPI_CLUSTER"
-
+        if is_service_enabled neutron; then
+            iniset $NOVA_CONF vmware integration_bridge $OVS_BRIDGE
+        fi
 
     # fake
     # ----