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 5a9533a76ff76b3bd603e948fe5930dd132433aa..ec08d595ea7f6f55ad61b3e51e32c84960095879 100644 (file)
--- 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