openstack/cinder
Code Issues Proposed changes

Merge "Use oslo.privsep for 'lvcreate'"

Browse Source
This commit is contained in:
Zuul 2019-02-16 07:43:43 +00:00 committed by Gerrit Code Review
commit 342b3d56ac
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cinder/brick/local_dev/lvm.py
View File

@ -147,8 +147,7 @@ class LVM(executor.Executor):
return exists return exists
def _create_vg(self, pv_list): def _create_vg(self, pv_list):
cmd = ['vgcreate', self.vg_name, ','.join(pv_list)] cinder.privsep.lvm.create_volume(self.vg_name, pv_list)
self._execute(*cmd, root_helper=self._root_helper, run_as_root=True)
def _get_thin_pool_free_space(self, vg_name, thin_pool_name): def _get_thin_pool_free_space(self, vg_name, thin_pool_name):
"""Returns available thin pool free space. """Returns available thin pool free space.

6
cinder/privsep/lvm.py
View File

@ -30,3 +30,9 @@ def udevadm_settle():
def lvrename(vg_name, lv_name, new_name): def lvrename(vg_name, lv_name, new_name):
processutils.execute( processutils.execute(
'lvrename', vg_name, lv_name, new_name) 'lvrename', vg_name, lv_name, new_name)
@cinder.privsep.sys_admin_pctxt.entrypoint
def create_vg(vg_name, pv_list):
cmd = ['vgcreate', vg_name, ','.join(pv_list)]
processutils.execute(*cmd)

3
etc/cinder/rootwrap.d/volume.filters
View File

@ -45,9 +45,6 @@ privsep-rootwrap-sys_admin: RegExpFilter, privsep-helper, root, privsep-helper,
# is updated appropriately. # is updated appropriately.
drbdadm: CommandFilter, drbdadm, root drbdadm: CommandFilter, drbdadm, root
# cinder/brick/local_dev/lvm.py: 'vgcreate', vg_name, pv_list
vgcreate: CommandFilter, vgcreate, root
# cinder/brick/local_dev/lvm.py: 'lvcreate', '-L', sizestr, '-n', volume_name,.. # cinder/brick/local_dev/lvm.py: 'lvcreate', '-L', sizestr, '-n', volume_name,..
# cinder/brick/local_dev/lvm.py: 'lvcreate', '-L', ... # cinder/brick/local_dev/lvm.py: 'lvcreate', '-L', ...
lvcreate: EnvFilter, env, root, LC_ALL=C, lvcreate lvcreate: EnvFilter, env, root, LC_ALL=C, lvcreate