diff options
| author | Christian Berendt <berendt@betacloud-solutions.de> | 2016-06-29 14:57:05 +0200 |
|---|---|---|
| committer | Christian Berendt <christian@berendt.io> | 2016-06-29 13:13:47 +0000 |
| commit | 2592a46c1402f090f34d47e6bb5a39474a1fd4d8 (patch) | |
| tree | 2a0f1f6221e6d446ade3a162d1fd71caef26f669 /docker | |
| parent | b7435eeb158e473e17a77190a52e11324a801a7b (diff) | |
| download | kolla-2592a46c1402f090f34d47e6bb5a39474a1fd4d8.tar.gz kolla-2592a46c1402f090f34d47e6bb5a39474a1fd4d8.zip | |
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
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/neutron/neutron-lbaas-agent/Dockerfile.j2 | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/docker/neutron/neutron-lbaas-agent/Dockerfile.j2 b/docker/neutron/neutron-lbaas-agent/Dockerfile.j2 index 2965309b2..9919c000b 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 %} |