From: Thierry Carrez <thierry@openstack.org>
Date: Tue, 24 Sep 2013 08:20:56 +0000 (+0200)
Subject: Specific /usr/local/bin/hus-cmd rootwrap filter
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=00d891514ae1c8ba134d28434faf4772468c7e39;p=openstack-build%2Fcinder-build.git

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 ff58e1b35..dfa8a99cc 100644
--- 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 720e08478..ba7ea698a 100644
--- 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