openstack
/
devstack
Code Issues Proposed changes

Merge "Cinder: only set volume_clear for LVM"

This commit is contained in:
Zuul 2021-05-12 16:26:21 +00:00 committed by Gerrit Code Review
parent 69a66fb62b 8c86e5a53e
commit 1259b7ecbc
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/cinder
View File

@ -286,9 +286,6 @@ function configure_cinder {
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

2
lib/cinder_backends/lvm
View File

@ -52,7 +52,7 @@ function configure_cinder_backend_lvm {
iniset $CINDER_CONF $be_name volume_group $VOLUME_GROUP_NAME-$be_name
iniset $CINDER_CONF $be_name target_helper "$CINDER_ISCSI_HELPER"
iniset $CINDER_CONF $be_name lvm_type "$CINDER_LVM_TYPE"
iniset $CINDER_CONF $be_name volume_clear "$CINDER_VOLUME_CLEAR"
}
# init_cinder_backend_lvm - Initialize volume group