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

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