From 1749da2fbf6b395b1a2cd77f349e0bea5d2f4a5e Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <marcin.juszkiewicz+kolla@linaro.org>
Date: Fri, 1 Apr 2022 13:41:14 +0200
Subject: docker: drop binary parts

Big patch drops all mentions of binary images support. Suggestions are
welcome how to split it into parts or handle better.

Change-Id: I5d5a46c6ce7734ceb8b844e17b43e359d7cac6e3
---
 docker/tacker/tacker-base/Dockerfile.j2      | 21 ---------------------
 docker/tacker/tacker-conductor/Dockerfile.j2 | 18 ------------------
 docker/tacker/tacker-server/Dockerfile.j2    | 18 ------------------
 3 files changed, 57 deletions(-)

(limited to 'docker/tacker')

diff --git a/docker/tacker/tacker-base/Dockerfile.j2 b/docker/tacker/tacker-base/Dockerfile.j2
index 4f6733328..b728b16da 100644
--- a/docker/tacker/tacker-base/Dockerfile.j2
+++ b/docker/tacker/tacker-base/Dockerfile.j2
@@ -10,25 +10,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {{ macros.enable_extra_repos(['openvswitch']) }}
 {{ macros.configure_user(name='tacker') }}
 
-{% if install_type == 'binary' %}
-
-    {% if base_package_type == 'rpm' %}
-        {% set tacker_base_packages = [
-            'openstack-tacker-common',
-            'python3-networking-sfc'
-        ] %}
-
-    {% elif base_package_type == 'deb' %}
-
-RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
-    && /bin/false
-
-    {% endif %}
-
-{{ macros.install_packages(tacker_base_packages | customizable("packages")) }}
-
-{% elif install_type == 'source' %}
-
 ADD tacker-base-archive /tacker-base-source
 ADD plugins-archive /
 
@@ -49,8 +30,6 @@ RUN ln -s tacker-base-source/* tacker \
         {{ macros.install_pip(tacker_base_plugins_pip_packages) }}; \
     fi
 
-{% endif %}
-
 COPY extend_start.sh /usr/local/bin/kolla_extend_start
 
 RUN touch /usr/local/bin/kolla_tacker_extend_start \
diff --git a/docker/tacker/tacker-conductor/Dockerfile.j2 b/docker/tacker/tacker-conductor/Dockerfile.j2
index f540cc5d6..48e3cd38c 100644
--- a/docker/tacker/tacker-conductor/Dockerfile.j2
+++ b/docker/tacker/tacker-conductor/Dockerfile.j2
@@ -7,24 +7,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {% import "macros.j2" as macros with context %}
 
-{% if install_type == 'binary' %}
-
-    {% if base_package_type == 'rpm' %}
-        {% set tacker_conductor_packages = [
-            'openstack-tacker'
-        ] %}
-
-    {% elif base_package_type == 'deb' %}
-
-RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
-    && /bin/false
-
-    {% endif %}
-
-{{ macros.install_packages(tacker_conductor_packages | customizable("packages")) }}
-
-{% endif %}
-
 {% block tacker_conductor_footer %}{% endblock %}
 {% block footer %}{% endblock %}
 
diff --git a/docker/tacker/tacker-server/Dockerfile.j2 b/docker/tacker/tacker-server/Dockerfile.j2
index dd8460ce5..3e13a02e8 100644
--- a/docker/tacker/tacker-server/Dockerfile.j2
+++ b/docker/tacker/tacker-server/Dockerfile.j2
@@ -7,24 +7,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {% import "macros.j2" as macros with context %}
 
-{% if install_type == 'binary' %}
-
-    {% if base_package_type == 'rpm' %}
-        {% set tacker_server_packages = [
-            'openstack-tacker'
-        ] %}
-
-    {% elif base_package_type == 'deb' %}
-
-RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
-    && /bin/false
-
-    {% endif %}
-
-{{ macros.install_packages(tacker_server_packages | customizable("packages")) }}
-
-{% endif %}
-
 COPY extend_start.sh /usr/local/bin/kolla_tacker_extend_start
 RUN chmod 755 /usr/local/bin/kolla_tacker_extend_start
 
-- 
cgit v1.2.3