From 2c5d462d910ba505df44d884f8cf9d6df9252b37 Mon Sep 17 00:00:00 2001
From: Robert Li <baoli@cisco.com>
Date: Tue, 21 Apr 2015 15:48:22 -0400
Subject: [PATCH] Add /usr/local/bin to exec_dirs in rootwrap.conf

devstack installs neutron utilities into /usr/local/bin such as
neutron-keepalived-state-change and neutron-ns-metadata-proxy.
In stead of adding individual filters to allow them to run from that
directory, this patch adds /usr/local/bin into exec_dirs.

Please also refer to I3abd1c173121dc8abb5738d1879db8ac9a98b690 for
discussion on the approach to fix the bug.

Change-Id: Iade8b5b09bb53018485c85f8372fb94dbc2ad2da
Closes-Bug: 1435971
---
 lib/neutron-legacy | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/neutron-legacy b/lib/neutron-legacy
index 3072d0a0ed..9f26239010 100644
--- a/lib/neutron-legacy
+++ b/lib/neutron-legacy
@@ -1145,6 +1145,8 @@ function _neutron_setup_rootwrap {
         sudo install -o root -g root -m 644 $NEUTRON_DIR/etc/rootwrap.conf $Q_RR_CONF_FILE
     fi
     sudo sed -e "s:^filters_path=.*$:filters_path=$Q_CONF_ROOTWRAP_D:" -i $Q_RR_CONF_FILE
+    sudo sed -e 's:^exec_dirs=\(.*\)$:exec_dirs=\1,/usr/local/bin:' -i $Q_RR_CONF_FILE
+
     # Specify ``rootwrap.conf`` as first parameter to neutron-rootwrap
     ROOTWRAP_SUDOER_CMD="$NEUTRON_ROOTWRAP $Q_RR_CONF_FILE *"
     ROOTWRAP_DAEMON_SUDOER_CMD="$NEUTRON_ROOTWRAP-daemon $Q_RR_CONF_FILE"