From: Robert Li <baoli@cisco.com>
Date: Tue, 21 Apr 2015 19:58:00 +0000 (-0400)
Subject: remove metadata_proxy_local filters for rootwrap
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=3b537033206a6321fe0f8300ce284ef518ac348c;p=openstack-build%2Fneutron-build.git

remove metadata_proxy_local filters for rootwrap

With the dependent patch Iade8b5b09bb53018485c85f8372fb94dbc2ad2da,
/usr/local/bin is added to exec_dirs in rootwrap.conf. Therefore, these
filters are no longer needed for devstack use case.

Depends-On: Iade8b5b09bb53018485c85f8372fb94dbc2ad2da
Change-Id: I98bff3cc679dfe19315f2b9b028ff48e4296e0de
---

diff --git a/etc/neutron/rootwrap.d/dhcp.filters b/etc/neutron/rootwrap.d/dhcp.filters
index 20d280011..156c9cfa5 100644
--- a/etc/neutron/rootwrap.d/dhcp.filters
+++ b/etc/neutron/rootwrap.d/dhcp.filters
@@ -23,9 +23,6 @@ dhcp_release: CommandFilter, dhcp_release, root
 
 # metadata proxy
 metadata_proxy: CommandFilter, neutron-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/neutron-ns-metadata-proxy, root
 # RHEL invocation of the metadata proxy will report /usr/bin/python
 kill_metadata: KillFilter, root, python, -9
 kill_metadata7: KillFilter, root, python2.7, -9
diff --git a/etc/neutron/rootwrap.d/l3.filters b/etc/neutron/rootwrap.d/l3.filters
index 27c78742c..0fdf60cd1 100644
--- a/etc/neutron/rootwrap.d/l3.filters
+++ b/etc/neutron/rootwrap.d/l3.filters
@@ -18,9 +18,6 @@ radvd: CommandFilter, radvd, root
 
 # metadata proxy
 metadata_proxy: CommandFilter, neutron-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/neutron-ns-metadata-proxy, root
 # RHEL invocation of the metadata proxy will report /usr/bin/python
 kill_metadata: KillFilter, root, python, -9
 kill_metadata7: KillFilter, root, python2.7, -9