Merge "Cinder: only set volume_clear for LVM"
This commit is contained in:
commit
1259b7ecbc
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user