Skip to content

Commit 668749a

Browse files
committed
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
1 parent e467cdf commit 668749a

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

lib/trove

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ fi
3333
GITDIR["python-troveclient"]=$DEST/python-troveclient
3434

3535
TROVE_DIR=$DEST/trove
36-
TROVE_CONF_DIR=/etc/trove
37-
TROVE_CONF=$TROVE_CONF_DIR/trove.conf
38-
TROVE_TASKMANAGER_CONF=$TROVE_CONF_DIR/trove-taskmanager.conf
39-
TROVE_CONDUCTOR_CONF=$TROVE_CONF_DIR/trove-conductor.conf
40-
TROVE_GUESTAGENT_CONF=$TROVE_CONF_DIR/trove-guestagent.conf
41-
TROVE_API_PASTE_INI=$TROVE_CONF_DIR/api-paste.ini
36+
TROVE_CONF_DIR=${TROVE_CONF_DIR:-/etc/trove}
37+
TROVE_CONF=${TROVE_CONF:-$TROVE_CONF_DIR/trove.conf}
38+
TROVE_TASKMANAGER_CONF=${TROVE_TASKMANAGER_CONF:-$TROVE_CONF_DIR/trove-taskmanager.conf}
39+
TROVE_CONDUCTOR_CONF=${TROVE_CONDUCTOR_CONF:-$TROVE_CONF_DIR/trove-conductor.conf}
40+
TROVE_GUESTAGENT_CONF=${TROVE_GUESTAGENT_CONF:-$TROVE_CONF_DIR/trove-guestagent.conf}
41+
TROVE_API_PASTE_INI=${TROVE_API_PASTE_INI:-$TROVE_CONF_DIR/api-paste.ini}
4242

4343
TROVE_LOCAL_CONF_DIR=$TROVE_DIR/etc/trove
4444
TROVE_LOCAL_API_PASTE_INI=$TROVE_LOCAL_CONF_DIR/api-paste.ini

0 commit comments

Comments
 (0)