Browse code
Merge "Improve log level conf for Sahara"
Jenkins authored on 2014/03/26 02:33:57Showing 1 changed files
| ... | ... |
@@ -28,7 +28,6 @@ SAHARA_BRANCH=${SAHARA_BRANCH:-master}
|
| 28 | 28 |
SAHARA_DIR=$DEST/sahara |
| 29 | 29 |
SAHARA_CONF_DIR=${SAHARA_CONF_DIR:-/etc/sahara}
|
| 30 | 30 |
SAHARA_CONF_FILE=${SAHARA_CONF_DIR}/sahara.conf
|
| 31 |
-SAHARA_DEBUG=${SAHARA_DEBUG:-True}
|
|
| 32 | 31 |
|
| 33 | 32 |
SAHARA_SERVICE_HOST=${SAHARA_SERVICE_HOST:-$SERVICE_HOST}
|
| 34 | 33 |
SAHARA_SERVICE_PORT=${SAHARA_SERVICE_PORT:-8386}
|
| ... | ... |
@@ -125,7 +124,8 @@ function configure_sahara {
|
| 125 | 125 |
iniset $SAHARA_CONF_FILE keystone_authtoken signing_dir $SAHARA_AUTH_CACHE_DIR |
| 126 | 126 |
iniset $SAHARA_CONF_FILE keystone_authtoken cafile $KEYSTONE_SSL_CA |
| 127 | 127 |
|
| 128 |
- iniset $SAHARA_CONF_FILE DEFAULT debug $SAHARA_DEBUG |
|
| 128 |
+ iniset $SAHARA_CONF_FILE DEFAULT verbose True |
|
| 129 |
+ iniset $SAHARA_CONF_FILE DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL |
|
| 129 | 130 |
|
| 130 | 131 |
iniset $SAHARA_CONF_FILE database connection `database_connection_url sahara` |
| 131 | 132 |
|