From cecbd1ff6fa56052018422e4892b9f58239d12b3 Mon Sep 17 00:00:00 2001
From: Yalei Wang <yalei.wang@intel.com>
Date: Mon, 5 Jan 2015 17:05:47 +0800
Subject: [PATCH] delete cinder configuration file before config it

Some misleading configuration item will remain if we don't delete the cinder
conf everytime before we configure it.

Change-Id: Iab6a5d7bc5fdcb05b28d24b0419c0bf380a140c1
Closes-bug: #1405301
---
 lib/cinder | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/cinder b/lib/cinder
index c106424378..3e8ed53f81 100644
--- a/lib/cinder
+++ b/lib/cinder
@@ -205,6 +205,8 @@ function configure_cinder {
 
     cp -p $CINDER_DIR/etc/cinder/policy.json $CINDER_CONF_DIR
 
+    rm -f $CINDER_CONF
+
     configure_cinder_rootwrap
 
     cp $CINDER_DIR/etc/cinder/api-paste.ini $CINDER_API_PASTE_INI