Rework directory structure

Create top-level directories for each release and put devstack and
the project repos under that.  data is still a top-level as it
will be processed for the upgrade.

README.rst

@@ -36,6 +36,29 @@ as 'base' and 'target'.
 * **Target**: The reference install of target OpenStack (maybe just DevStack)
 
 
+Directory Structure
+-------------------
+
+Grenade creates a set of directories for both the base and target
+OpenStack installation sources and DevStack.
+
+$DEST
+ |- data
+ |- logs                # Grenade logs
+ |- <base>
+ |   |- logs            # base DevStack logs
+ |   |- devstack
+ |   |- cinder
+ |   |- ...
+ |   |- swift
+ |- <target>
+ |   |- logs            # target DevStack logs
+ |   |- devstack
+ |   |- cinder
+ |   |- ...
+ |   |- swift
+
+
 Install Grenade
 ---------------
 

devstack.localrc.base

@@ -1,9 +1,11 @@
-# localrc for DevStack work installation (stable/essex)
-GRENADE_PHASE=work
+# localrc for DevStack base installation (stable/folsom)
+GRENADE_PHASE=base
 
 # Default to selecting an interface via the default route
 unset HOST_IP
 
+DEST=$TOP_DIR/..
+
 # Timeouts
 ACTIVE_TIMEOUT=120
 ASSOCIATE_TIMEOUT=60
@@ -12,7 +14,6 @@ SERVICE_TIMEOUT=120
 
 ADMIN_PASSWORD=0penstack
 API_RATE_LIMIT=False
-#KEYSTONE_CATALOG_BACKEND=sql
 LOGDAYS=1
 LOGFILE=$DEST/logs/stack.sh.log
 MYSQL_PASSWORD=superstack

devstack.localrc.target

@@ -1,9 +1,11 @@
-# localrc for DevStack trunk installation (master)
-GRENADE_PHASE=trunk
+# localrc for DevStack target installation (master)
+GRENADE_PHASE=target
 
 # Default to selecting an interface via the default route
 unset HOST_IP
 
+DEST=$TOP_DIR/..
+
 # Timeouts
 ACTIVE_TIMEOUT=120
 ASSOCIATE_TIMEOUT=60

grenade.sh

@@ -12,7 +12,7 @@
 # ``stop-label`` is the name of the step after which the script will stop.
 # This is useful for debugging upgrades.
 
-# Keep track of the devstack directory
+# Keep track of the Grenade directory
 GRENADE_DIR=$(cd $(dirname "$0") && pwd)
 
 # Import common functions

grenaderc

@@ -13,16 +13,19 @@ DATA_DIR=${DEST}/data
 
 # Release info
 BASE_RELEASE=folsom
+BASE_RELEASE_DIR=$DEST/$BASE_RELEASE
+
 TARGET_RELEASE=grizzly
+TARGET_RELEASE_DIR=$DEST/$TARGET_RELEASE
 
 # DevStack sources
 BASE_DEVSTACK_REPO=$GIT_BASE/openstack-dev/devstack.git
 BASE_DEVSTACK_BRANCH=stable/$BASE_RELEASE
-BASE_DEVSTACK_DIR=$DEST/devstack.$BASE_RELEASE
+BASE_DEVSTACK_DIR=$BASE_RELEASE_DIR/devstack
 
 TARGET_DEVSTACK_REPO=$BASE_DEVSTACK_REPO
 TARGET_DEVSTACK_BRANCH=master
-TARGET_DEVSTACK_DIR=$DEST/devstack.$TARGET_RELEASE
+TARGET_DEVSTACK_DIR=$TARGET_RELEASE_DIR/devstack
 
 # Allow skipping the exercises
 RUN_EXERCISES=True
@@ -43,12 +46,12 @@ CURRENT_LOG_TIME=${CURRENT_LOG_TIME:-$(date "+$TIMESTAMP_FORMAT")}
 SCREEN_LOGDIR=$DEST/logs/screen
 
 # Project directories
-GLANCECLIENT_DIR=$DEST/python-glanceclient
-GLANCE_DIR=$DEST/glance
-KEYSTONECLIENT_DIR=$DEST/python-keystoneclient
-KEYSTONE_DIR=$DEST/keystone
-NOVACLIENT_DIR=$DEST/python-novaclient
-NOVA_DIR=$DEST/nova
+GLANCECLIENT_DIR=python-glanceclient
+GLANCE_DIR=glance
+KEYSTONECLIENT_DIR=python-keystoneclient
+KEYSTONE_DIR=keystone
+NOVACLIENT_DIR=python-novaclient
+NOVA_DIR=nova
 
 # Allow local overrides of env variables
 if [ -f $RC_DIR/localrc ]; then