commit cecbd1ff6fa56052018422e4892b9f58239d12b3
author Yalei Wang <yalei.wang@intel.com> Mon Jan 05 17:05:47 2015 +0800
committer Yalei Wang <yalei.wang@intel.com> Tue Jan 06 12:56:37 2015 +0800
tree ecbd554ed0d2e2b07c6d868a7ede77162b97415a
parent 5c0a3cfb71ef8c8faca92c19e4eee4968eb309e3

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

diff --git a/lib/cinder b/lib/cinder
index c106424..3e8ed53 100644
--- a/lib/cinder
+++ b/lib/cinder
@@ -205,6 +205,8 @@
 
     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