volume_clear is currently set in the DEFAULT section,
but this is a backend specific setting, and therefore
needs to be set in the backend config section.
Change-Id: Ifa3a659bb4768b8915a0f23e7f14b0f3348d93d2
| ... | ... |
@@ -289,6 +289,9 @@ function configure_cinder {
|
| 289 | 289 |
default_name=$be_name |
| 290 | 290 |
fi |
| 291 | 291 |
enabled_backends+=$be_name, |
| 292 |
+ |
|
| 293 |
+ iniset $CINDER_CONF $be_name volume_clear $CINDER_VOLUME_CLEAR |
|
| 294 |
+ |
|
| 292 | 295 |
done |
| 293 | 296 |
iniset $CINDER_CONF DEFAULT enabled_backends ${enabled_backends%,*}
|
| 294 | 297 |
if [[ -n "$default_name" ]]; then |
| ... | ... |
@@ -318,8 +321,6 @@ function configure_cinder {
|
| 318 | 318 |
|
| 319 | 319 |
iniset_rpc_backend cinder $CINDER_CONF |
| 320 | 320 |
|
| 321 |
- iniset $CINDER_CONF DEFAULT volume_clear $CINDER_VOLUME_CLEAR |
|
| 322 |
- |
|
| 323 | 321 |
# Format logging |
| 324 | 322 |
setup_logging $CINDER_CONF $CINDER_USE_MOD_WSGI |
| 325 | 323 |
|