From 616708d16300c937c9c7ae7a9e9f9a8e8525a7de Mon Sep 17 00:00:00 2001 From: Eduardo Gonzalez Date: Tue, 31 Jul 2018 16:00:52 +0200 Subject: [PATCH] Add neutron dragent package for RPM binary builds Change-Id: Ief8f075a57f8e365499fddbca25b1af71ccfc96c Closes-Bug: #1772552 --- docker/neutron/neutron-bgp-dragent/Dockerfile.j2 | 6 ++++-- kolla/image/build.py | 2 -- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/neutron/neutron-bgp-dragent/Dockerfile.j2 b/docker/neutron/neutron-bgp-dragent/Dockerfile.j2 index a43d3d7184..aee0c9b92e 100644 --- a/docker/neutron/neutron-bgp-dragent/Dockerfile.j2 +++ b/docker/neutron/neutron-bgp-dragent/Dockerfile.j2 @@ -7,8 +7,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if install_type == 'binary' %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} -RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ - && /bin/false + {% set neutron_bgp_dragent_packages = [ + 'openstack-neutron-bgp-dragent' + ] %} + {% elif base_distro in ['ubuntu', 'debian'] %} {% set neutron_bgp_dragent_packages = [ 'neutron-bgp-dragent' diff --git a/kolla/image/build.py b/kolla/image/build.py index 513c31875c..b8c263c2c9 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -87,7 +87,6 @@ SKIPPED_IMAGES = { "kuryr-base", "monasca-base", "monasca-thresh", - "neutron-bgp-dragent", "nova-mksproxy", "ovsdpdk", "searchlight-base", @@ -182,7 +181,6 @@ SKIPPED_IMAGES = { "monasca-base", "monasca-thresh", "nova-mksproxy", - "neutron-bgp-dragent", "ovsdpdk", "searchlight-base", "solum-base",