openstack/charm-cinder
Code Issues Proposed changes

Revert local changes, use better disk cleaning

Browse Source
This commit is contained in:
James Page
2014-04-14 15:41:11 +01:00
parent 63d53d4a47
commit b4190c3cb4
3 changed files with 31 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
hooks/cinder_utils.py
View File

@@ -319,16 +319,6 @@ def configure_lvm_storage(block_devices, volume_group, overwrite=False):
extend_lvm_volume_group(volume_group, new_device)
def lvm_zap_disk(block_device):
'''
Clear a block device of partition table. Relies on sgdisk, which is
installed as pat of the 'gdisk' package in Ubuntu.
:param block_device: str: Full path of block device to clean.
'''
subprocess.check_call(['sgdisk', '--zap-all', block_device])
def clean_storage(block_device):
'''Ensures a block device is clean. That is:
- unmounted
@@ -343,7 +333,12 @@ def clean_storage(block_device):
juju_log('clean_storage(): Found %s mounted @ %s, unmounting.' %
(d, mp))
umount(mp, persist=True)
lvm_zap_disk(block_device)
if is_lvm_physical_volume(block_device):
deactivate_lvm_volume_group(block_device)
remove_lvm_physical_volume(block_device)
zap_disk(block_device)
def _parse_block_device(block_device):