openstack
/
devstack
Code Issues Proposed changes

Merge "Remove VGs when cleaning LVM up in devstack"

This commit is contained in:
Jenkins 2017-07-14 03:06:50 +00:00 committed by Gerrit Code Review
parent 2f7df51cfa 8175df1912
commit adc7f8e8dd
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/lvm
View File

@ -35,7 +35,7 @@ BACKING_FILE_SUFFIX=-backing-file
# _clean_lvm_volume_group removes all default LVM volumes
#
# Usage: clean_lvm_volume_group $vg
# Usage: _clean_lvm_volume_group $vg
function _clean_lvm_volume_group {
local vg=$1
@ -43,6 +43,16 @@ function _clean_lvm_volume_group {
sudo lvremove -f $vg
}
# _remove_lvm_volume_group removes the volume group
#
# Usage: _remove_lvm_volume_group $vg
function _remove_lvm_volume_group {
local vg=$1
# Remove the volume group
sudo vgremove -f $vg
}
# _clean_lvm_backing_file() removes the backing file of the
# volume group
#
@ -69,6 +79,7 @@ function clean_lvm_volume_group {
local vg=$1
_clean_lvm_volume_group $vg
_remove_lvm_volume_group $vg
# if there is no logical volume left, it's safe to attempt a cleanup
# of the backing file
if [[ -z "$(sudo lvs --noheadings -o lv_name $vg 2>/dev/null)" ]]; then