aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeffrey Zhang <zhang.lei.fly@gmail.com>2017-01-27 23:11:48 +0800
committerJeffrey Zhang <zhang.lei.fly@gmail.com>2017-01-27 23:11:48 +0800
commit0612a5a98cdd45dc74f63d3134a55a0e3a32eb6a (patch)
tree8b6af44ebe627debca5e94c74373c6876e5239d5
parentd3eb84c56d591ef1b63b1f0343c481b8a08470b5 (diff)
downloadkolla-0612a5a98cdd45dc74f63d3134a55a0e3a32eb6a.tar.gz
kolla-0612a5a98cdd45dc74f63d3134a55a0e3a32eb6a.zip
rootwrap filters is removed in networking-sfc
patch I2277cb4c3165d19255d275a79533f456aea30f07 removed the duplicated filters in networking-sfc Change-Id: Ia64d44455fbf14b22597cc29fb6b3798e3855189
-rw-r--r--docker/neutron/neutron-sfc-agent/Dockerfile.j24
1 files changed, 1 insertions, 3 deletions
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 %}