From 1adc365aad0e1c85746e476dcb256b1f6f22e7af Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Thu, 20 Jun 2013 12:06:59 -0700 Subject: [PATCH] Don't run heat on grizzly. Change-Id: Ic91d99faaad16c830a93387b20e3abc711c46060 --- devstack-vm-gate.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/devstack-vm-gate.sh b/devstack-vm-gate.sh index 331be97a..cfa4bc65 100755 --- a/devstack-vm-gate.sh +++ b/devstack-vm-gate.sh @@ -53,6 +53,15 @@ function setup_localrc() { else MY_ENABLED_SERVICES=$MY_ENABLED_SERVICES,n-vol fi + elif [ "$LOCALRC_BRANCH" == "stable/grizzly" ]; then + MY_ENABLED_SERVICES=$MY_ENABLED_SERVICES,s-proxy,s-account,s-container,s-object,cinder,c-api,c-vol,c-sch,n-cond + if [ "$DEVSTACK_GATE_QUANTUM" -eq "1" ]; then + MY_ENABLED_SERVICES=$MY_ENABLED_SERVICES,quantum,q-svc,q-agt,q-dhcp,q-l3,q-meta + echo "Q_USE_DEBUG_COMMAND=True" >>localrc + echo "NETWORK_GATEWAY=10.1.0.1" >>localrc + else + MY_ENABLED_SERVICES=$MY_ENABLED_SERVICES,n-net + fi else # master MY_ENABLED_SERVICES=$MY_ENABLED_SERVICES,s-proxy,s-account,s-container,s-object,cinder,c-api,c-vol,c-sch,n-cond,heat,h-api,h-api-cfn,h-api-cw,h-eng if [ "$DEVSTACK_GATE_QUANTUM" -eq "1" ]; then