Merge "Check if cinder is enabled before doing anything lvm2 related"

This commit is contained in:
Jenkins 2015-06-25 10:35:08 +00:00 committed by Gerrit Code Review
commit 28b481ec0b

View File

@ -187,5 +187,10 @@ if [[ -n "$SCREEN" ]]; then
fi
# BUG: maybe it doesn't exist? We should isolate this further down.
clean_lvm_volume_group $DEFAULT_VOLUME_GROUP_NAME || /bin/true
clean_lvm_filter
# NOTE: Cinder automatically installs the lvm2 package, independently of the
# enabled backends. So if Cinder is enabled, we are sure lvm (lvremove,
# /etc/lvm/lvm.conf, etc.) is here.
if is_service_enabled cinder; then
clean_lvm_volume_group $DEFAULT_VOLUME_GROUP_NAME || /bin/true
clean_lvm_filter
fi