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

4 files changed, 2 insertions, 56 deletions

diff --git a/docker/heat/heat-api-cfn/Dockerfile.j2 b/docker/heat/heat-api-cfn/Dockerfile.j2
index bcedec273..42dd55199 100644
--- a/docker/heat/heat-api-cfn/Dockerfile.j2
+++ b/docker/heat/heat-api-cfn/Dockerfile.j2
@@ -7,15 +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 heat_api_cfn_packages = ['openstack-heat-api-cfn'] %}
-    {% elif base_package_type == 'deb' %}
-        {% set heat_api_cfn_packages = ['heat-api-cfn'] %}
-    {% endif %}
-{{ macros.install_packages(heat_api_cfn_packages | customizable("packages")) }}
-{% endif %}
-
 COPY extend_start.sh /usr/local/bin/kolla_heat_extend_start
 RUN chmod 755 /usr/local/bin/kolla_heat_extend_start
 
diff --git a/docker/heat/heat-api/Dockerfile.j2 b/docker/heat/heat-api/Dockerfile.j2
index e69fe1da6..af9c5e0ad 100644
--- a/docker/heat/heat-api/Dockerfile.j2
+++ b/docker/heat/heat-api/Dockerfile.j2
@@ -7,15 +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 heat_api_packages = ['openstack-heat-api'] %}
-    {% elif base_package_type == 'deb' %}
-        {% set heat_api_packages = ['heat-api'] %}
-    {% endif %}
-{{ macros.install_packages(heat_api_packages | customizable("packages")) }}
-{% endif %}
-
 COPY extend_start.sh /usr/local/bin/kolla_heat_extend_start
 RUN chmod 755 /usr/local/bin/kolla_heat_extend_start
 
diff --git a/docker/heat/heat-base/Dockerfile.j2 b/docker/heat/heat-base/Dockerfile.j2
index 1a1e2e3b9..bb26cf0c4 100644
--- a/docker/heat/heat-base/Dockerfile.j2
+++ b/docker/heat/heat-base/Dockerfile.j2
@@ -10,24 +10,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {{ macros.enable_extra_repos(['openvswitch']) }}
 {{ macros.configure_user(name='heat') }}
 
-{% if install_type == 'binary' %}
-
-{% if base_package_type == 'rpm' %}
-    {% set heat_base_packages = [
-        'openstack-heat-common'
-    ] %}
-
-{{ macros.install_packages(heat_base_packages | customizable("packages")) }}
-{% elif base_package_type == 'deb' %}
-    {% set heat_base_packages = [
-        'heat-common'
-    ] %}
-{{ macros.install_packages(heat_base_packages | customizable("packages")) }}
-{% endif %}
-
-{% elif install_type == 'source' %}
-    {% set heat_base_packages = [
-    ] %}
+{% set heat_base_packages = [
+] %}
 
 {{ macros.install_packages(heat_base_packages | customizable("packages")) }}
 
@@ -43,8 +27,6 @@ RUN ln -s heat-base-source/* heat \
     && cp -r /heat/etc/heat/* /etc/heat/ \
     && chown -R heat: /etc/heat
 
-{% endif %}
-
 COPY extend_start.sh /usr/local/bin/kolla_extend_start
 
 RUN touch /usr/local/bin/kolla_heat_extend_start \
diff --git a/docker/heat/heat-engine/Dockerfile.j2 b/docker/heat/heat-engine/Dockerfile.j2
index 41efb0fc9..513021301 100644
--- a/docker/heat/heat-engine/Dockerfile.j2
+++ b/docker/heat/heat-engine/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 heat_engine_packages = [
-            'openstack-heat-engine',
-            'python3-barbicanclient',
-        ] %}
-    {% elif base_package_type == 'deb' %}
-        {# TODO(mnasiadka): Remove extra clients once bug 1893935 is solved in UCA #}
-        {# bug: https://bugs.launchpad.net/cloud-archive/+bug/1893935 #}
-        {% set heat_engine_packages = [
-            'heat-engine',
-            'python3-vitrageclient',
-            'python3-zunclient',
-        ] %}
-    {% endif %}
-{{ macros.install_packages(heat_engine_packages | customizable("packages")) }}
-
-{% endif %}
 {% block heat_engine_footer %}{% endblock %}
 {% block footer %}{% endblock %}