From: Maru Newby <mnewby@internap.com>
Date: Tue, 4 Dec 2012 00:27:53 +0000 (+0000)
Subject: Fix rootwrap cfg for src installed metadata proxy.
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=4ec139ef12373eb2b150860594727c26dd201ff5;p=openstack-build%2Fneutron-build.git

Fix rootwrap cfg for src installed metadata proxy.

 * The metadata proxy script will be installed to /usr/local/bin
   if installed from source, rather than the default /usr/bin.
   The filter config needs to be updated to reflect this or
   invacation of the proxy by the l3 agent will fail.

Change-Id: Iccb4133b1ac33a1b9b232c1d68979fe646e1b977
---

diff --git a/etc/quantum/rootwrap.d/l3.filters b/etc/quantum/rootwrap.d/l3.filters
index 5a9533a76..ec08d595e 100644
--- a/etc/quantum/rootwrap.d/l3.filters
+++ b/etc/quantum/rootwrap.d/l3.filters
@@ -18,6 +18,9 @@ route: CommandFilter, /sbin/route, root
 
 # metadata proxy
 metadata_proxy: CommandFilter, /usr/bin/quantum-ns-metadata-proxy, root
+# If installed from source (say, by devstack), the prefix will be
+# /usr/local instead of /usr/bin.
+metadata_proxy_local: CommandFilter, /usr/local/bin/quantum-ns-metadata-proxy, root
 kill_metadata7: KillFilter, root, /usr/bin/python2.7, -9
 kill_metadata6: KillFilter, root, /usr/bin/python2.6, -9