From 0612a5a98cdd45dc74f63d3134a55a0e3a32eb6a Mon Sep 17 00:00:00 2001 From: Jeffrey Zhang Date: Fri, 27 Jan 2017 23:11:48 +0800 Subject: rootwrap filters is removed in networking-sfc patch I2277cb4c3165d19255d275a79533f456aea30f07 removed the duplicated filters in networking-sfc Change-Id: Ia64d44455fbf14b22597cc29fb6b3798e3855189 --- docker/neutron/neutron-sfc-agent/Dockerfile.j2 | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'docker') diff --git a/docker/neutron/neutron-sfc-agent/Dockerfile.j2 b/docker/neutron/neutron-sfc-agent/Dockerfile.j2 index 2c30a2242..a2daf90d0 100644 --- a/docker/neutron/neutron-sfc-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-sfc-agent/Dockerfile.j2 @@ -12,9 +12,7 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ ADD neutron-sfc-agent-archive /neutron-sfc-agent-source RUN ln -s neutron-sfc-agent-source/* neutron-sfc-agent \ - && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /neutron-sfc-agent \ - && cp /neutron-sfc-agent/etc/neutron/rootwrap.d/* /etc/neutron/rootwrap.d \ - && sed -i 's|^exec_dirs.*|exec_dirs=/var/lib/kolla/venv/bin,/sbin,/usr/sbin,/bin,/usr/bin,/usr/local/bin,/usr/local/sbin|g' /etc/neutron/rootwrap.conf + && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /neutron-sfc-agent {% endif %} -- cgit v1.2.3