From 70ffba824177e967e5829852b534e05f50486745 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Mon, 6 Jul 2020 12:06:45 +0200 Subject: [PATCH] openvswitch-netcontrold: build always This is infrastructure package where binary/source split does not make sense. Change-Id: I445134333b50439af20a3ca12757d519fa2624d4 --- docker/openvswitch/openvswitch-netcontrold/Dockerfile.j2 | 9 --------- kolla/image/build.py | 1 - 2 files changed, 10 deletions(-) diff --git a/docker/openvswitch/openvswitch-netcontrold/Dockerfile.j2 b/docker/openvswitch/openvswitch-netcontrold/Dockerfile.j2 index fdbaf3fac4..9246dffef8 100644 --- a/docker/openvswitch/openvswitch-netcontrold/Dockerfile.j2 +++ b/docker/openvswitch/openvswitch-netcontrold/Dockerfile.j2 @@ -7,13 +7,6 @@ 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 - -{% elif install_type == 'source' %} - {% block openvswitch_netcontrold_install %} {% set openvswitch_netcontrold_packages = [ @@ -31,8 +24,6 @@ RUN {{ macros.install_pip(openvswitch_netcontrold_pip_packages | customizable("p {% endblock %} -{% endif %} - COPY extend_start.sh /usr/local/bin/kolla_openvswitch_extend_start RUN chmod 755 /usr/local/bin/kolla_openvswitch_extend_start diff --git a/kolla/image/build.py b/kolla/image/build.py index e432bfb9a1..96ae2d58d9 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -107,7 +107,6 @@ UNBUILDABLE_IMAGES = { "monasca-base", "monasca-thresh", "nova-mksproxy", - "openvswitch-netcontrold", "qinling-base", "searchlight-base", "solum-base",