From 9342ed6b6f2bc235e095a5031441073737383946 Mon Sep 17 00:00:00 2001 From: Eduardo Gonzalez Date: Fri, 5 Jan 2018 15:11:57 +0100 Subject: Add networking-sfc package to tacker images Tacker need networking-sfc package to allow creation of SFC flows in neutron. Change-Id: I825fa9f67cfadb99d6bd90d7bc322747bd44fca4 --- docker/tacker/tacker-base/Dockerfile.j2 | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'docker') diff --git a/docker/tacker/tacker-base/Dockerfile.j2 b/docker/tacker/tacker-base/Dockerfile.j2 index d3a9f4701..4bc277170 100644 --- a/docker/tacker/tacker-base/Dockerfile.j2 +++ b/docker/tacker/tacker-base/Dockerfile.j2 @@ -11,7 +11,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set tacker_base_packages = [ - 'openstack-tacker-common' + 'openstack-tacker-common', + 'python-networking-sfc' ] %} {% elif base_distro in ['debian', 'ubuntu'] %} @@ -26,16 +27,24 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ {% elif install_type == 'source' %} ADD tacker-base-archive /tacker-base-source +ADD plugins-archive / {% set tacker_base_pip_packages = [ '/tacker' ] %} +{% set tacker_base_plugins_pip_packages = [ + '/plugins/*' +] %} + RUN ln -s tacker-base-source/* tacker \ && {{ macros.install_pip(tacker_base_pip_packages | customizable("pip_packages")) }} \ && mkdir -p /etc/tacker \ && cp -r /tacker/etc/tacker/* /etc/tacker \ - && chown -R tacker: /etc/tacker + && chown -R tacker: /etc/tacker \ + && if [ "$(ls /plugins)" ]; then \ + {{ macros.install_pip(tacker_base_plugins_pip_packages) }}; \ + fi {% endif %} -- cgit v1.2.3