diff --git a/cinder/volume/drivers/lvm.py b/cinder/volume/drivers/lvm.py index 862fe238f11..3b48840c3e5 100644 --- a/cinder/volume/drivers/lvm.py +++ b/cinder/volume/drivers/lvm.py @@ -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'], diff --git a/cinder/volume/utils.py b/cinder/volume/utils.py index 7b6dce592b5..0014d400953 100644 --- a/cinder/volume/utils.py +++ b/cinder/volume/utils.py @@ -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)