From 2592a46c1402f090f34d47e6bb5a39474a1fd4d8 Mon Sep 17 00:00:00 2001 From: Christian Berendt Date: Wed, 29 Jun 2016 14:57:05 +0200 Subject: [PATCH] Copy lbaas-haproxy.filters file to /etc/neutron/rootwrap.d The copy instructions do copy the README.txt file and the oslo-config-generator directory to /etc/neutron. This makes no sense. Only the neutron/rootwrap.d/lbaas-haproxy.filters should be copied to /etc/neutron/rootwrap.d. TrivialFix Change-Id: I2dfd86b718166d1d3e348dd9ba14056bb763e64f --- docker/neutron/neutron-lbaas-agent/Dockerfile.j2 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docker/neutron/neutron-lbaas-agent/Dockerfile.j2 b/docker/neutron/neutron-lbaas-agent/Dockerfile.j2 index 2965309b2b..9919c000b1 100644 --- a/docker/neutron/neutron-lbaas-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-lbaas-agent/Dockerfile.j2 @@ -37,8 +37,7 @@ RUN apt-get -y install --no-install-recommends \ ADD neutron-lbaas-agent-archive /neutron-lbaas-agent-source RUN ln -s neutron-lbaas-agent-source/* neutron_lbaas \ && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /neutron_lbaas \ - && cp -r /neutron_lbaas/etc/* /etc/neutron/ \ - && cp -r /neutron_lbaas/etc/neutron/* /etc/neutron/ \ + && cp /neutron_lbaas/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 {% endif %}