commit be677f4403f69f03b3719661ceed71c34bf431a6
author armando-migliaccio <amigliaccio@nicira.com> Fri Jul 12 08:22:31 2013 -0700
committer armando-migliaccio <amigliaccio@nicira.com> Fri Jul 12 08:22:31 2013 -0700
tree be3e4a65ef8be6038b64d0aa1f1f0d8a326a31db
parent 4d3d0c0d85d61a2f23f0c25fc382782de4cfc119

Add integration bridge to the nova.conf

This is needed when running the compute service with
vSphere as virt backend, and Neutron as networking
solution.

Fixes bug #1200677

Change-Id: Iff01559be437d1409c13224574458d23a1edd1a4

stack.sh

diff --git a/stack.sh b/stack.sh
index c4f7944..530b7b7 100755
--- a/stack.sh
+++ b/stack.sh
@@ -1080,7 +1080,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
     # ----