From 101fc2d7f8123e1f3e5abb4b369249103abfd9a2 Mon Sep 17 00:00:00 2001 From: Paul Bourke Date: Wed, 16 Nov 2016 12:59:38 +0000 Subject: Install neutron-fwaas plugin in neutron-base Change-Id: I9ca36012cff2e17ea877a775e8e1ca5837a2bcb1 Partially-Implements: bp kolla-neutron-fwaas --- docker/neutron/neutron-base/Dockerfile.j2 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'docker') diff --git a/docker/neutron/neutron-base/Dockerfile.j2 b/docker/neutron/neutron-base/Dockerfile.j2 index 7ea2b585d..71cad931a 100644 --- a/docker/neutron/neutron-base/Dockerfile.j2 +++ b/docker/neutron/neutron-base/Dockerfile.j2 @@ -71,6 +71,7 @@ RUN mkdir -p /usr/share/neutron \ {{ macros.install_packages(neutron_base_packages | customizable("packages")) }} ADD neutron-base-archive /neutron-base-source +ADD plugins-archive / RUN ln -s neutron-base-source/* neutron \ && useradd --user-group neutron \ && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /neutron \ @@ -80,7 +81,10 @@ RUN ln -s neutron-base-source/* neutron \ && cp /neutron/etc/api-paste.ini /usr/share/neutron \ && mv /etc/neutron/neutron/ /etc/neutron/plugins/ \ && chown -R neutron: /etc/neutron /usr/share/neutron /var/lib/neutron /home/neutron \ - && 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 + && 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 \ + && if [ "$(ls /plugins)" ]; then \ + pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /plugins/*; \ + fi {% endif %} -- cgit v1.2.3