openstack
/
cinder
Code Issues Proposed changes

use cinder utils.get_root_helper 

Replaced all of the manual entries of
the root_helper with the cinder
utils.get_root_helper()

Closes-Bug: #1233907

Change-Id: I4c9b4c27ed4b779595a272436d79ec068e7ee537
This commit is contained in:
Walter A. Boring IV 2013-10-02 11:24:25 -07:00
parent 3cd27defb1
commit a9a3608252
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cinder/volume/drivers/lvm.py
View File

@ -704,7 +704,7 @@ class LVMISCSIDriver(LVMVolumeDriver, driver.ISCSIDriver):
LOG.error(_('%s'), message)
return false_ret
helper = 'sudo cinder-rootwrap %s' % CONF.rootwrap_config
helper = utils.get_root_helper()
dest_vg_ref = lvm.LVM(dest_vg, helper, lvm_type, self._execute)
self.remove_export(ctxt, volume)
self._create_volume(volume['name'],

8
cinder/volume/utils.py
View File

@ -198,22 +198,22 @@ def copy_volume(srcstr, deststr, size_in_m, sync=False,
def supports_thin_provisioning():
return brick_lvm.LVM.supports_thin_provisioning(
'sudo cinder-rootwrap %s' % CONF.rootwrap_config)
utils.get_root_helper())
def get_all_volumes(vg_name=None, no_suffix=True):
return brick_lvm.LVM.get_all_volumes(
'sudo cinder-rootwrap %s' % CONF.rootwrap_config,
utils.get_root_helper(),
vg_name, no_suffix)
def get_all_physical_volumes(vg_name=None, no_suffix=True):
return brick_lvm.LVM.get_all_physical_volumes(
'sudo cinder-rootwrap %s' % CONF.rootwrap_config,
utils.get_root_helper(),
vg_name, no_suffix)
def get_all_volume_groups(vg_name=None, no_suffix=True):
return brick_lvm.LVM.get_all_volume_groups(
'sudo cinder-rootwrap %s' % CONF.rootwrap_config,
utils.get_root_helper(),
vg_name, no_suffix)