Only use cinder in >essex.

Change-Id: I2f9295ad194739823086343d733e06c6f2cdbcaf
This commit is contained in:
James E. Blair
2012-07-26 07:57:15 -07:00
parent 8c351d5d69
commit 398f6af1d8

View File

@@ -23,12 +23,18 @@ set -o errexit
cd $DEST/devstack
ENABLED_SERVICES=g-api,g-reg,key,n-api,n-crt,n-obj,n-cpu,n-net,n-sch,cinder,c-api,c-vol,c-sch,horizon,mysql,rabbit
ENABLED_SERVICES=g-api,g-reg,key,n-api,n-crt,n-obj,n-cpu,n-net,n-sch,horizon,mysql,rabbit
if [ "$DEVSTACK_GATE_TEMPEST" -eq "1" ]; then
ENABLED_SERVICES=$ENABLED_SERVICES,tempest
fi
if [ "$BRANCH" != "stable/diablo" ] && [ "$BRANCH" != "stable/essex" ]; then
ENABLED_SERVICES=$ENABLED_SERVICES,cinder,c-api,c-vol,c-sch
else
ENABLED_SERVICES=$ENABLED_SERVICES,n-vol
fi
cat <<EOF >localrc
ACTIVE_TIMEOUT=60
BOOT_TIMEOUT=90