diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-02-18 14:17:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-02-18 14:17:37 +0000 |
| commit | 891aa33194bf53f5ac7940ece3266ea00b0cff2e (patch) | |
| tree | ed6b49268fd78721147e21c68e54f05cab6fe4d7 /devstack | |
| parent | 58dfccecd8328b46eb6bf6d1e950ab3b74a503aa (diff) | |
| parent | e44ff4da484ff88144ead52c4638cd4b449f471b (diff) | |
| download | ceilometer-891aa33194bf53f5ac7940ece3266ea00b0cff2e.tar.gz | |
Merge "cleanup devstack cache initialisation"
Diffstat (limited to 'devstack')
| -rw-r--r-- | devstack/plugin.sh | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 25cce1e4..ee0165f2 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -219,11 +219,13 @@ function cleanup_ceilometer { function _ceilometer_configure_cache_backend { iniset $CEILOMETER_CONF cache enabled True iniset $CEILOMETER_CONF cache backend $CEILOMETER_CACHE_BACKEND - iniset $CEILOMETER_CONF cache backend_argument url:$CEILOMETER_CACHE_URL - iniadd_literal $CEILOMETER_CONF cache backend_argument distributed_lock:True + + inidelete $CEILOMETER_CONF cache backend_argument + iniadd $CEILOMETER_CONF cache backend_argument url:$CEILOMETER_CACHE_URL + iniadd $CEILOMETER_CONF cache backend_argument distributed_lock:True if [[ "${CEILOMETER_CACHE_BACKEND##*.}" == "redis" ]]; then - iniadd_literal $CEILOMETER_CONF cache backend_argument db:0 - iniadd_literal $CEILOMETER_CONF cache backend_argument redis_expiration_time:600 + iniadd $CEILOMETER_CONF cache backend_argument db:0 + iniadd $CEILOMETER_CONF cache backend_argument redis_expiration_time:600 fi } |