From: Walter A. Boring IV <walter.boring@hp.com>
Date: Wed, 2 Oct 2013 18:24:25 +0000 (-0700)
Subject: use cinder utils.get_root_helper
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=a9a36082528a6d46d950b5e83cb46c2af389317a;p=openstack-build%2Fcinder-build.git

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
---

diff --git a/cinder/volume/drivers/lvm.py b/cinder/volume/drivers/lvm.py
index 862fe238f..3b48840c3 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 7b6dce592..0014d4009 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)