| ... | ... |
@@ -23,15 +23,6 @@ source $RC_DIR/functions |
| 23 | 23 |
# Destination path for installation |
| 24 | 24 |
DEST=/opt/stack |
| 25 | 25 |
|
| 26 |
-# Destination for working data |
|
| 27 |
-DATA_DIR=${DEST}/data
|
|
| 28 |
- |
|
| 29 |
-# Destination for status files |
|
| 30 |
-SERVICE_DIR=${DEST}/status
|
|
| 31 |
- |
|
| 32 |
-# Path for subunit output file |
|
| 33 |
-SUBUNIT_OUTPUT=${DEST}/devstack.subunit
|
|
| 34 |
- |
|
| 35 | 26 |
# Determine stack user |
| 36 | 27 |
if [[ $EUID -eq 0 ]]; then |
| 37 | 28 |
STACK_USER=stack |
| ... | ... |
@@ -137,6 +128,15 @@ elif [[ -f $RC_DIR/.localrc.auto ]]; then |
| 137 | 137 |
source $RC_DIR/.localrc.auto |
| 138 | 138 |
fi |
| 139 | 139 |
|
| 140 |
+# Destination for working data |
|
| 141 |
+DATA_DIR=${DATA_DIR:-$DEST/data}
|
|
| 142 |
+ |
|
| 143 |
+# Destination for status files |
|
| 144 |
+SERVICE_DIR=${SERVICE_DIR:-$DEST/status}
|
|
| 145 |
+ |
|
| 146 |
+# Path for subunit output file |
|
| 147 |
+SUBUNIT_OUTPUT=${SUBUNIT_OUTPUT:-$DEST/devstack.subunit}
|
|
| 148 |
+ |
|
| 140 | 149 |
# Default for log coloring is based on interactive-or-not. |
| 141 | 150 |
# Baseline assumption is that non-interactive invocations are for CI, |
| 142 | 151 |
# where logs are to be presented as browsable text files; hence color |