From be677f4403f69f03b3719661ceed71c34bf431a6 Mon Sep 17 00:00:00 2001
From: armando-migliaccio <amigliaccio@nicira.com>
Date: Fri, 12 Jul 2013 08:22:31 -0700
Subject: [PATCH] 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 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/stack.sh b/stack.sh
index c4f7944d65..530b7b7e73 100755
--- a/stack.sh
+++ b/stack.sh
@@ -1080,7 +1080,9 @@ if is_service_enabled nova; then
         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
     # ----