openstack/devstack
Code Issues Proposed changes

Merge "Allow external ENV setup for conf files"

Browse Source
This commit is contained in:
Jenkins
2015-03-25 15:20:06 +00:00
committed by Gerrit Code Review
parent 4e81d247a4 668749ae85
commit b23054c4b4
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/trove
View File

@@ -33,12 +33,12 @@ fi
GITDIR["python-troveclient"]=$DEST/python-troveclient GITDIR["python-troveclient"]=$DEST/python-troveclient
TROVE_DIR=$DEST/trove TROVE_DIR=$DEST/trove
TROVE_CONF_DIR=/etc/trove TROVE_CONF_DIR=${TROVE_CONF_DIR:-/etc/trove}
TROVE_CONF=$TROVE_CONF_DIR/trove.conf TROVE_CONF=${TROVE_CONF:-$TROVE_CONF_DIR/trove.conf}
TROVE_TASKMANAGER_CONF=$TROVE_CONF_DIR/trove-taskmanager.conf TROVE_TASKMANAGER_CONF=${TROVE_TASKMANAGER_CONF:-$TROVE_CONF_DIR/trove-taskmanager.conf}
TROVE_CONDUCTOR_CONF=$TROVE_CONF_DIR/trove-conductor.conf TROVE_CONDUCTOR_CONF=${TROVE_CONDUCTOR_CONF:-$TROVE_CONF_DIR/trove-conductor.conf}
TROVE_GUESTAGENT_CONF=$TROVE_CONF_DIR/trove-guestagent.conf TROVE_GUESTAGENT_CONF=${TROVE_GUESTAGENT_CONF:-$TROVE_CONF_DIR/trove-guestagent.conf}
TROVE_API_PASTE_INI=$TROVE_CONF_DIR/api-paste.ini TROVE_API_PASTE_INI=${TROVE_API_PASTE_INI:-$TROVE_CONF_DIR/api-paste.ini}
TROVE_LOCAL_CONF_DIR=$TROVE_DIR/etc/trove TROVE_LOCAL_CONF_DIR=$TROVE_DIR/etc/trove
TROVE_LOCAL_API_PASTE_INI=$TROVE_LOCAL_CONF_DIR/api-paste.ini TROVE_LOCAL_API_PASTE_INI=$TROVE_LOCAL_CONF_DIR/api-paste.ini