diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-07-01 12:58:17 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-07-01 12:58:17 +0000 |
| commit | 869eca422c5613d466cc3c8729a36d914748f59a (patch) | |
| tree | 511b257be67f4dc3674d78fe6438328d1ba46bd4 /docker | |
| parent | 5e237af73d20d0dcc97323e8c008bea4267cd73e (diff) | |
| parent | 2592a46c1402f090f34d47e6bb5a39474a1fd4d8 (diff) | |
| download | kolla-869eca422c5613d466cc3c8729a36d914748f59a.tar.gz kolla-869eca422c5613d466cc3c8729a36d914748f59a.zip | |
Merge "Copy lbaas-haproxy.filters file to /etc/neutron/rootwrap.d"
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 %} |