diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-01-28 04:03:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-01-28 04:03:00 +0000 |
| commit | 32a7b22de70d93b44c7f09dcf3c73199c3cc0fec (patch) | |
| tree | 408eb50099bc44398063af95591b4b612f6af681 | |
| parent | d74b52659f2d6cb0273443a9d78a9506267a850a (diff) | |
| parent | 0612a5a98cdd45dc74f63d3134a55a0e3a32eb6a (diff) | |
| download | kolla-32a7b22de70d93b44c7f09dcf3c73199c3cc0fec.tar.gz kolla-32a7b22de70d93b44c7f09dcf3c73199c3cc0fec.zip | |
Merge "rootwrap filters is removed in networking-sfc"
| -rw-r--r-- | docker/neutron/neutron-sfc-agent/Dockerfile.j2 | 4 |
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 %} |