From 1331445b6f360f975e2304a2e063737cc1db4036 Mon Sep 17 00:00:00 2001
From: Dean Troyer <dtroyer@gmail.com>
Date: Tue, 23 Oct 2012 15:09:50 -0500
Subject: [PATCH] Clean up local state paths

Puts additional state and lock paths for swift, quantum and nova
into $DATA_DIR/project that can be set independently of $DEST.

Change-Id: I2cca701856d3caa7fe472fefdd8b070a3c7f3adf
---
 lib/nova | 1 +
 stack.sh | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/nova b/lib/nova
index dbfc294787..f428895581 100644
--- a/lib/nova
+++ b/lib/nova
@@ -316,6 +316,7 @@ function init_nova() {
     fi
     if [ -n "$NOVA_STATE_PATH" ]; then
         add_nova_opt "state_path=$NOVA_STATE_PATH"
+        add_nova_opt "lock_path=$NOVA_STATE_PATH"
     fi
     if [ -n "$NOVA_INSTANCES_PATH" ]; then
         add_nova_opt "instances_path=$NOVA_INSTANCES_PATH"
diff --git a/stack.sh b/stack.sh
index 3fc3204d63..170250926e 100755
--- a/stack.sh
+++ b/stack.sh
@@ -503,7 +503,7 @@ fi
 
 # Set ``SWIFT_DATA_DIR`` to the location of swift drives and objects.
 # Default is the common DevStack data directory.
-SWIFT_DATA_DIR=${SWIFT_DATA_DIR:-${DEST}/data/swift}
+SWIFT_DATA_DIR=${SWIFT_DATA_DIR:-${DATA_DIR}/swift}
 
 # Set ``SWIFT_CONFIG_DIR`` to the location of the configuration files.
 # Default is ``/etc/swift``.
@@ -1439,6 +1439,7 @@ if is_service_enabled q-dhcp; then
     # Set debug
     iniset $Q_DHCP_CONF_FILE DEFAULT debug True
     iniset $Q_DHCP_CONF_FILE DEFAULT use_namespaces $Q_USE_NAMESPACE
+    iniset $Q_DHCP_CONF_FILE DEFAULT state_path $DATA_DIR/quantum
 
     quantum_setup_keystone $Q_DHCP_CONF_FILE DEFAULT set_auth_url