From e44ff4da484ff88144ead52c4638cd4b449f471b Mon Sep 17 00:00:00 2001
From: gord chung <gord@live.ca>
Date: Thu, 9 Feb 2017 22:30:17 +0000
Subject: [PATCH] cleanup devstack cache initialisation

devstack has issues setting multiple value options. it does not
know how to replace properly and ends up just replacing everything.
just delete all previous options if they exist to avoid unexpected
residual values.

Change-Id: I1cb1e4fdddfb9ec7dac321b9e70f688c575a7775
---
 devstack/plugin.sh | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index dbeb60c194..edb8a65adc 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
 }