From 11d6180d66e0fe31785b3c3a0413fc52ee538192 Mon Sep 17 00:00:00 2001
From: Dan Smith <danms@us.ibm.com>
Date: Mon, 19 Nov 2012 16:21:18 -0800
Subject: [PATCH] Start nova-conductor when running on master

Change-Id: I53e9588c52ba604cc0e77bbc44de366caf9d2633
---
 devstack-vm-gate.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/devstack-vm-gate.sh b/devstack-vm-gate.sh
index 7f9c6c04..a811cc3d 100755
--- a/devstack-vm-gate.sh
+++ b/devstack-vm-gate.sh
@@ -49,7 +49,7 @@ elif [ "$ZUUL_BRANCH" == "stable/folsom" ]; then
 	ENABLED_SERVICES=$ENABLED_SERVICES,n-vol
     fi
 else # master
-    ENABLED_SERVICES=$ENABLED_SERVICES,swift,cinder,c-api,c-vol,c-sch
+    ENABLED_SERVICES=$ENABLED_SERVICES,swift,cinder,c-api,c-vol,c-sch,n-cond
     if [ "$DEVSTACK_GATE_QUANTUM" -eq "1" ]; then
 	ENABLED_SERVICES=$ENABLED_SERVICES,quantum,q-svc,q-agt,q-dhcp,q-l3
 	cat <<EOF >>localrc