openstack/devstack
Code Issues Proposed changes

Allow external ENV setup for conf files

Browse Source 
In order to keep redstack in synch with devstack, the conf files
referenced within devstack need to be able to be declared externally.

This change allows *_CONF values to be specified, and uses the
original values as defaults.

Change-Id: Ic67f6347b92b05619103a77e9f7ea80a299a6869
This commit is contained in:
Peter Stachowski 2015-03-24 18:00:29 +00:00
parent e467cdfeb1
commit 668749ae85
1 changed files with 6 additions and 6 deletions
Show Stats 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