commit b3ced44e37d7dea38188209b5380f7c2fcd34b1a
author Jenkins <jenkins@review.openstack.org> Wed May 31 05:14:58 2017 +0000
committer Gerrit Code Review <review@openstack.org> Wed May 31 05:14:58 2017 +0000
tree b6aa9604e110b74bf09cbdb5c5f60fe14792393a
parent d94f44558a44a424ef3d01da79e65f2b57520760
parent 29ec28216f91eab118134b5444e0276ef845e0d0

Merge "Configure volume_clear setting per backend"

lib/cinder

diff --git a/lib/cinder b/lib/cinder
index 2f302c0..762edc4 100644
--- a/lib/cinder
+++ b/lib/cinder
@@ -289,6 +289,9 @@
                 default_name=$be_name
             fi
             enabled_backends+=$be_name,
+
+            iniset $CINDER_CONF $be_name volume_clear $CINDER_VOLUME_CLEAR
+
         done
         iniset $CINDER_CONF DEFAULT enabled_backends ${enabled_backends%,*}
         if [[ -n "$default_name" ]]; then
@@ -318,8 +321,6 @@
 
     iniset_rpc_backend cinder $CINDER_CONF
 
-    iniset $CINDER_CONF DEFAULT volume_clear $CINDER_VOLUME_CLEAR
-
     # Format logging
     setup_logging $CINDER_CONF $CINDER_USE_MOD_WSGI