From 718d66f6779368814522f132c0f9f8f5c01211c6 Mon Sep 17 00:00:00 2001 From: Chuck Short Date: Sun, 25 Jun 2017 14:49:21 -0500 Subject: Use packages when installing neutron-sfc-agent All linux distros supported by kolla has a python-networking-sfc package. So install said package. Change-Id: I1ce40ffd36ac72ea4f052b3aec8fa874530dc41e Signed-off-by: Chuck Short --- docker/neutron/neutron-sfc-agent/Dockerfile.j2 | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'docker') diff --git a/docker/neutron/neutron-sfc-agent/Dockerfile.j2 b/docker/neutron/neutron-sfc-agent/Dockerfile.j2 index 5915ac5e4..9fb4e7c0f 100644 --- a/docker/neutron/neutron-sfc-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-sfc-agent/Dockerfile.j2 @@ -6,9 +6,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} - -RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ - && /bin/false + {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} + {% set networking_sfc_agent = ['python-networking-sfc'] %} + {% elif base_distro in ['debian', 'ubuntu'] %} + {% set networking_sfc_agent = ['python-networking-sfc'] %} + {% endif %} + {{ macros.install_packages(networking_sfc_agent | customizable("packages")) }} {% elif install_type == 'source' %} -- cgit v1.2.3