From f6fd4dcf2e9c29f3ed4b911abc16bbb4b8af4b70 Mon Sep 17 00:00:00 2001 From: Dean Troyer Date: Tue, 11 Oct 2011 20:03:05 -0500 Subject: [PATCH] Check out devstack by default --- stackrc | 4 ++++ tools/build_ramdisk.sh | 2 ++ 2 files changed, 6 insertions(+) diff --git a/stackrc b/stackrc index 15d73ce..871db69 100644 --- a/stackrc +++ b/stackrc @@ -27,6 +27,10 @@ NOVACLIENT_BRANCH=master OPENSTACKX_REPO=https://github.com/cloudbuilders/openstackx.git OPENSTACKX_BRANCH=diablo +# devstack is this collection of scripts +DEVSTACK_REPO=https://github.com/cloudbuilders/devstack.git +DEVSTACK_BRANCH=master + # allow local overrides of env variables if [ -f ./localrc ]; then source ./localrc diff --git a/tools/build_ramdisk.sh b/tools/build_ramdisk.sh index 63d37a9..85d3743 100755 --- a/tools/build_ramdisk.sh +++ b/tools/build_ramdisk.sh @@ -100,6 +100,8 @@ git_clone $OPENSTACKX_REPO $DEST/openstackx $OPENSTACKX_BRANCH if [ "$USE_CURRENT_DEVSTACK" = "1" ]; then rm -rf $CHROOTCACHE/natty-stack/$DEST/devstack cp -pr $CWD $CHROOTCACHE/natty-stack/$DEST/devstack +else + git_clone $DEVSTACK_REPO $DEST/devstack $DEVSTACK_BRANCH fi # Configure host network for DHCP