openstack/kolla
Code Issues Proposed changes

Merge "Use packages when installing neutron-sfc-agent"

Browse Source
This commit is contained in:
Jenkins 2017-06-28 08:52:08 +00:00 committed by Gerrit Code Review
commit 06d84707ad
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
docker/neutron/neutron-sfc-agent/Dockerfile.j2
View File

@ -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' %}

4
tests/test_build.py
View File

@ -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",