From: Han Zhou Date: Tue, 2 Sep 2014 09:54:05 +0000 (+0000) Subject: Remove absolute path in KillFilter for metadata-proxy X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=4de8a3cd94c6d65702dcda457653edc6c93a3722;p=openstack-build%2Fneutron-build.git Remove absolute path in KillFilter for metadata-proxy This commit fix the problem of killing neutron-ns-metadata-proxy when running in Virtual Environment. Change-Id: I987dd87e19c218846a48e58b61679b4153d97f66 Closes-bug: #1363773 --- diff --git a/etc/neutron/rootwrap.d/dhcp.filters b/etc/neutron/rootwrap.d/dhcp.filters index 88d61e8e3..26c2ffa86 100644 --- a/etc/neutron/rootwrap.d/dhcp.filters +++ b/etc/neutron/rootwrap.d/dhcp.filters @@ -29,9 +29,9 @@ metadata_proxy_quantum: CommandFilter, quantum-ns-metadata-proxy, root metadata_proxy_local: CommandFilter, /usr/local/bin/neutron-ns-metadata-proxy, root metadata_proxy_local_quantum: CommandFilter, /usr/local/bin/quantum-ns-metadata-proxy, root # RHEL invocation of the metadata proxy will report /usr/bin/python -kill_metadata: KillFilter, root, /usr/bin/python, -9 -kill_metadata7: KillFilter, root, /usr/bin/python2.7, -9 -kill_metadata6: KillFilter, root, /usr/bin/python2.6, -9 +kill_metadata: KillFilter, root, python, -9 +kill_metadata7: KillFilter, root, python2.7, -9 +kill_metadata6: KillFilter, root, python2.6, -9 # ip_lib ip: IpFilter, ip, root diff --git a/etc/neutron/rootwrap.d/l3.filters b/etc/neutron/rootwrap.d/l3.filters index 8a662b954..656316982 100644 --- a/etc/neutron/rootwrap.d/l3.filters +++ b/etc/neutron/rootwrap.d/l3.filters @@ -24,9 +24,9 @@ metadata_proxy_quantum: CommandFilter, quantum-ns-metadata-proxy, root metadata_proxy_local: CommandFilter, /usr/local/bin/neutron-ns-metadata-proxy, root metadata_proxy_local_quantum: CommandFilter, /usr/local/bin/quantum-ns-metadata-proxy, root # RHEL invocation of the metadata proxy will report /usr/bin/python -kill_metadata: KillFilter, root, /usr/bin/python, -9 -kill_metadata7: KillFilter, root, /usr/bin/python2.7, -9 -kill_metadata6: KillFilter, root, /usr/bin/python2.6, -9 +kill_metadata: KillFilter, root, python, -9 +kill_metadata7: KillFilter, root, python2.7, -9 +kill_metadata6: KillFilter, root, python2.6, -9 kill_radvd_usr: KillFilter, root, /usr/sbin/radvd, -9, -HUP kill_radvd: KillFilter, root, /sbin/radvd, -9, -HUP