Merge "Revert "Allow properly overriding DEST""
This commit is contained in:
commit
d7c9d2e27e
18
stackrc
18
stackrc
@ -16,6 +16,15 @@ source $RC_DIR/functions
|
|||||||
# Destination path for installation
|
# Destination path for installation
|
||||||
DEST=/opt/stack
|
DEST=/opt/stack
|
||||||
|
|
||||||
|
# Destination for working data
|
||||||
|
DATA_DIR=${DEST}/data
|
||||||
|
|
||||||
|
# Destination for status files
|
||||||
|
SERVICE_DIR=${DEST}/status
|
||||||
|
|
||||||
|
# Path for subunit output file
|
||||||
|
SUBUNIT_OUTPUT=${DEST}/devstack.subunit
|
||||||
|
|
||||||
# Determine stack user
|
# Determine stack user
|
||||||
if [[ $EUID -eq 0 ]]; then
|
if [[ $EUID -eq 0 ]]; then
|
||||||
STACK_USER=stack
|
STACK_USER=stack
|
||||||
@ -121,15 +130,6 @@ elif [[ -f $RC_DIR/.localrc.auto ]]; then
|
|||||||
source $RC_DIR/.localrc.auto
|
source $RC_DIR/.localrc.auto
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Destination for working data
|
|
||||||
DATA_DIR=${DATA_DIR:-$DEST/data}
|
|
||||||
|
|
||||||
# Destination for status files
|
|
||||||
SERVICE_DIR=${SERVICE_DIR:-$DEST/status}
|
|
||||||
|
|
||||||
# Path for subunit output file
|
|
||||||
SUBUNIT_OUTPUT=${SUBUNIT_OUTPUT:-$DEST/devstack.subunit}
|
|
||||||
|
|
||||||
# Default for log coloring is based on interactive-or-not.
|
# Default for log coloring is based on interactive-or-not.
|
||||||
# Baseline assumption is that non-interactive invocations are for CI,
|
# Baseline assumption is that non-interactive invocations are for CI,
|
||||||
# where logs are to be presented as browsable text files; hence color
|
# where logs are to be presented as browsable text files; hence color
|
||||||
|
Loading…
x
Reference in New Issue
Block a user