Start nova-conductor when running on master

Change-Id: I53e9588c52ba604cc0e77bbc44de366caf9d2633
This commit is contained in:
Dan Smith
2012-11-19 16:21:18 -08:00
parent 6dbc269899
commit 11d6180d66

View File

@@ -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