From 668749ae8582bd19e22bb1d0ec46cf3a18cc1bf0 Mon Sep 17 00:00:00 2001 From: Peter Stachowski Date: Tue, 24 Mar 2015 18:00:29 +0000 Subject: [PATCH] Allow external ENV setup for conf files 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 --- lib/trove | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/trove b/lib/trove index 4c5a438fb8..5dd4f23611 100644 --- a/lib/trove +++ b/lib/trove @@ -33,12 +33,12 @@ fi GITDIR["python-troveclient"]=$DEST/python-troveclient TROVE_DIR=$DEST/trove -TROVE_CONF_DIR=/etc/trove -TROVE_CONF=$TROVE_CONF_DIR/trove.conf -TROVE_TASKMANAGER_CONF=$TROVE_CONF_DIR/trove-taskmanager.conf -TROVE_CONDUCTOR_CONF=$TROVE_CONF_DIR/trove-conductor.conf -TROVE_GUESTAGENT_CONF=$TROVE_CONF_DIR/trove-guestagent.conf -TROVE_API_PASTE_INI=$TROVE_CONF_DIR/api-paste.ini +TROVE_CONF_DIR=${TROVE_CONF_DIR:-/etc/trove} +TROVE_CONF=${TROVE_CONF:-$TROVE_CONF_DIR/trove.conf} +TROVE_TASKMANAGER_CONF=${TROVE_TASKMANAGER_CONF:-$TROVE_CONF_DIR/trove-taskmanager.conf} +TROVE_CONDUCTOR_CONF=${TROVE_CONDUCTOR_CONF:-$TROVE_CONF_DIR/trove-conductor.conf} +TROVE_GUESTAGENT_CONF=${TROVE_GUESTAGENT_CONF:-$TROVE_CONF_DIR/trove-guestagent.conf} +TROVE_API_PASTE_INI=${TROVE_API_PASTE_INI:-$TROVE_CONF_DIR/api-paste.ini} TROVE_LOCAL_CONF_DIR=$TROVE_DIR/etc/trove TROVE_LOCAL_API_PASTE_INI=$TROVE_LOCAL_CONF_DIR/api-paste.ini