Specific /usr/local/bin/hus-cmd rootwrap filter

Add a specific filter for /usr/local/bin/hus-cmd, rather than adding
/usr/local/bin to the list of exec_path in rootwrap.conf. This allows to
sync rootwrap directly from oslo-incubator without having to edit the
default value for exec_dirs.

Change-Id: Ic264ca248d025fb5496fe0b48e8b3ec9376fb9e2

diff --git a/etc/cinder/rootwrap.conf b/etc/cinder/rootwrap.conf
index ff58e1b35b51524e081e369c2798b7c9ba663345..dfa8a99ccddc760f21ec19624e8dd9b39d46373e 100644 (file)
--- a/etc/cinder/rootwrap.conf
+++ b/etc/cinder/rootwrap.conf
@@ -10,7 +10,7 @@ filters_path=/etc/cinder/rootwrap.d,/usr/share/cinder/rootwrap
 # explicitely specify a full path (separated by ',')
 # If not specified, defaults to system PATH environment variable.
 # These directories MUST all be only writeable by root !
-exec_dirs=/sbin,/usr/sbin,/bin,/usr/bin,/usr/local/bin
+exec_dirs=/sbin,/usr/sbin,/bin,/usr/bin
 
 # Enable logging to syslog
 # Default value is False

diff --git a/etc/cinder/rootwrap.d/volume.filters b/etc/cinder/rootwrap.d/volume.filters
index 720e08478dd43c98c38c7d9ed35e0d633a4a71d5..ba7ea698a835910e495d90bf662901def88dba42 100644 (file)
--- a/etc/cinder/rootwrap.d/volume.filters
+++ b/etc/cinder/rootwrap.d/volume.filters
@@ -67,6 +67,7 @@ mv: CommandFilter, mv, root
 
 # cinder/volumes/drivers/hds/hds.py:
 hus-cmd: CommandFilter, hus-cmd, root
+hus-cmd_local: CommandFilter, /usr/local/bin/hus-cmd, root
 
 # cinder/brick/initiator/connector.py:
 ls: CommandFilter, ls, root