diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-06-28 08:52:08 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-06-28 08:52:08 +0000 |
| commit | 06d84707ad7eb1cebbf03cc663f08b4b3dfb08fa (patch) | |
| tree | 3aa44832c9bc0611ca035c86d75f17f274afb021 | |
| parent | 0f6ac6635dcd34a771294d42b0aa937984dbe5ea (diff) | |
| parent | 718d66f6779368814522f132c0f9f8f5c01211c6 (diff) | |
| download | kolla-06d84707ad7eb1cebbf03cc663f08b4b3dfb08fa.tar.gz kolla-06d84707ad7eb1cebbf03cc663f08b4b3dfb08fa.zip | |
Merge "Use packages when installing neutron-sfc-agent"
| -rw-r--r-- | docker/neutron/neutron-sfc-agent/Dockerfile.j2 | 9 | ||||
| -rw-r--r-- | tests/test_build.py | 4 |
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", |