diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-11-13 21:10:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-11-13 21:10:44 +0000 |
| commit | b5d7e827dd996a02efb7526b7c3be6a93cfde350 (patch) | |
| tree | 79d5c977695d709d1daeafc827306c265d016f2d | |
| parent | c789142899c974a78e66a88b5ad2dc67dbf9a31c (diff) | |
| parent | 4e7b97eaeae0ef18e88f428f112bed78255a4d1d (diff) | |
| download | neutron-b5d7e827dd996a02efb7526b7c3be6a93cfde350.tar.gz | |
Merge "rootwrap config files reference deleted quantum binaries" into stable/juno
| -rw-r--r-- | etc/neutron/rootwrap.d/dhcp.filters | 2 | ||||
| -rw-r--r-- | etc/neutron/rootwrap.d/l3.filters | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/etc/neutron/rootwrap.d/dhcp.filters b/etc/neutron/rootwrap.d/dhcp.filters index 26c2ffa86c..7c11d70dbd 100644 --- a/etc/neutron/rootwrap.d/dhcp.filters +++ b/etc/neutron/rootwrap.d/dhcp.filters @@ -23,11 +23,9 @@ dhcp_release: CommandFilter, dhcp_release, root # metadata proxy metadata_proxy: CommandFilter, neutron-ns-metadata-proxy, root -metadata_proxy_quantum: CommandFilter, 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/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, 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 9a3031822a..d9e4a13c46 100644 --- a/etc/neutron/rootwrap.d/l3.filters +++ b/etc/neutron/rootwrap.d/l3.filters @@ -18,11 +18,9 @@ radvd: CommandFilter, radvd, root # metadata proxy metadata_proxy: CommandFilter, neutron-ns-metadata-proxy, root -metadata_proxy_quantum: CommandFilter, 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/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, python, -9 kill_metadata7: KillFilter, root, python2.7, -9 |