aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChuck Short <charles.short@ericsson.com>2017-06-25 14:49:21 -0500
committerChuck Short <charles.short@ericsson.com>2017-06-27 12:53:47 -0500
commit718d66f6779368814522f132c0f9f8f5c01211c6 (patch)
treee5f7dd3f58aa3a6cc434c3ce0b58f23d6fcbdb65
parent357eeadce441e770a0bd691e18be165e784cb62a (diff)
downloadkolla-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>
-rw-r--r--docker/neutron/neutron-sfc-agent/Dockerfile.j29
-rw-r--r--tests/test_build.py4
2 files changed, 6 insertions, 7 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' %}
diff --git a/tests/test_build.py b/tests/test_build.py
index 2d99168c7..c138ae34a 100644
--- a/tests/test_build.py
+++ b/tests/test_build.py
@@ -81,7 +81,6 @@ class BuildTestCentosBinary(BuildTest, base.BaseTestCase):
"kuryr-base",
"monasca-base",
"neutron-bgp-dragent",
- "neutron-sfc-agent",
"searchlight-base",
"senlin-base",
"solum-base",
@@ -123,7 +122,6 @@ class BuildTestUbuntuBinary(BuildTest, base.BaseTestCase):
"kuryr-base",
"mistral-event-engine",
"monasca-base",
- "neutron-sfc-agent",
"octavia-base",
"panko-base",
"searchlight-base",
@@ -167,7 +165,6 @@ class BuildTestDebianBinary(BuildTest, base.BaseTestCase):
"kuryr-base",
"mistral-event-engine",
"monasca-base",
- "neutron-sfc-agent",
"octavia-base",
"panko-base",
"searchlight-base",
@@ -210,7 +207,6 @@ class BuildTestOracleLinuxBinary(BuildTest, base.BaseTestCase):
"kuryr-base",
"monasca-base",
"neutron-bgp-dragent",
- "neutron-sfc-agent",
"searchlight-base",
"senlin-base",
"solum-base",