From: Fergal Mc Carthy <fergal.mccarthy@hpe.com>
Date: Tue, 27 Oct 2015 18:25:45 +0000 (-0400)
Subject: lvconvert missing from cinder volume.filters
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=e8509ceb240faf929b9220eec1eff2a9cd5568ef;p=openstack-build%2Fcinder-build.git

lvconvert missing from cinder volume.filters

The LVM lvconvert command is invoked by the revert method of the
cinder.brick.local_dev.lvm.LVM class but was missing a matching
volume.filters CommandFilter entry which has now been added.

Change-Id: Ib436f562a6dd7b8828e34051b5d73273c1f52b50
Closes-Bug: 1510654
---

diff --git a/etc/cinder/rootwrap.d/volume.filters b/etc/cinder/rootwrap.d/volume.filters
index 9e7ab384c..c4187eaec 100644
--- a/etc/cinder/rootwrap.d/volume.filters
+++ b/etc/cinder/rootwrap.d/volume.filters
@@ -61,6 +61,9 @@ lvextend: CommandFilter, lvextend, root
 # cinder/brick/local_dev/lvm.py: 'lvchange -a y -K <lv>'
 lvchange: CommandFilter, lvchange, root
 
+# cinder/brick/local_dev/lvm.py: 'lvconvert', '--merge', snapshot_name
+lvconvert: CommandFilter, lvconvert, root
+
 # cinder/volume/driver.py: 'iscsiadm', '-m', 'discovery', '-t',...
 # cinder/volume/driver.py: 'iscsiadm', '-m', 'node', '-T', ...
 iscsiadm: CommandFilter, iscsiadm, root