openstack/kolla
Code Issues Proposed changes

Copy lbaas-haproxy.filters file to /etc/neutron/rootwrap.d

Browse Source 
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
This commit is contained in:
Christian Berendt 2016-06-29 14:57:05 +02:00 committed by Christian Berendt
parent b7435eeb15
commit 2592a46c14
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docker/neutron/neutron-lbaas-agent/Dockerfile.j2
View File

@ -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 %}