Browse code
Merge "Allow external ENV setup for conf files"
Jenkins authored on 2015/03/26 00:20:06Showing 1 changed files
| ... | ... |
@@ -33,12 +33,12 @@ fi |
| 33 | 33 |
GITDIR["python-troveclient"]=$DEST/python-troveclient |
| 34 | 34 |
|
| 35 | 35 |
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}
|
|
| 42 | 42 |
|
| 43 | 43 |
TROVE_LOCAL_CONF_DIR=$TROVE_DIR/etc/trove |
| 44 | 44 |
TROVE_LOCAL_API_PASTE_INI=$TROVE_LOCAL_CONF_DIR/api-paste.ini |