diff options
| author | Chuck Short <charles.short@ericsson.com> | 2017-06-25 14:49:21 -0500 |
|---|---|---|
| committer | Chuck Short <charles.short@ericsson.com> | 2017-06-27 12:53:47 -0500 |
| commit | 718d66f6779368814522f132c0f9f8f5c01211c6 (patch) | |
| tree | e5f7dd3f58aa3a6cc434c3ce0b58f23d6fcbdb65 /docker | |
| parent | 357eeadce441e770a0bd691e18be165e784cb62a (diff) | |
| download | kolla-718d66f6779368814522f132c0f9f8f5c01211c6.tar.gz kolla-718d66f6779368814522f132c0f9f8f5c01211c6.zip | |
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 <charles.short@ericsson.com>
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/neutron/neutron-sfc-agent/Dockerfile.j2 | 9 |
1 files changed, 6 insertions, 3 deletions
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' %} |