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

5 files changed, 2 insertions, 67 deletions

diff --git a/docker/mistral/mistral-api/Dockerfile.j2 b/docker/mistral/mistral-api/Dockerfile.j2
index 36612f5a3..87994f864 100644
--- a/docker/mistral/mistral-api/Dockerfile.j2
+++ b/docker/mistral/mistral-api/Dockerfile.j2
@@ -7,27 +7,10 @@ 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 mistral_api_packages = [
-            'openstack-mistral-api'
-        ] %}
+{% set mistral_api_packages = [
+] %}
 {{ macros.install_packages(mistral_api_packages | customizable("packages")) }}
 
-    {% elif base_package_type == 'deb' %}
-        {% set mistral_api_packages = [
-            'mistral-api'
-        ] %}
-{{ macros.install_packages(mistral_api_packages | customizable("packages")) }}
-    {% endif %}
-
-{% elif install_type == 'source' %}
-
-    {% set mistral_api_packages = [
-    ] %}
-{{ macros.install_packages(mistral_api_packages | customizable("packages")) }}
-{% endif %}
-
 COPY extend_start.sh /usr/local/bin/kolla_mistral_extend_start
 RUN chmod 755 /usr/local/bin/kolla_mistral_extend_start
 
diff --git a/docker/mistral/mistral-base/Dockerfile.j2 b/docker/mistral/mistral-base/Dockerfile.j2
index d2f608f59..dd48bd4b7 100644
--- a/docker/mistral/mistral-base/Dockerfile.j2
+++ b/docker/mistral/mistral-base/Dockerfile.j2
@@ -9,25 +9,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {{ macros.configure_user(name='mistral') }}
 
-{% if install_type == 'binary' %}
-
-    {% if base_package_type == 'rpm' %}
-        {% set mistral_base_packages = [
-            'openstack-mistral-common',
-            'openstack-tacker',
-            'redis',
-        ] %}
-# Note(egonzalez): Ubuntu does not have tacker packages yet.
-    {% elif base_package_type == 'deb' %}
-        {% set mistral_base_packages = [
-            'mistral-common',
-            'redis-server'
-        ] %}
-    {% endif %}
-{{ macros.install_packages(mistral_base_packages | customizable("packages")) }}
-
-{% elif install_type == 'source' %}
-
 ADD mistral-base-archive /mistral-base-source
 ADD plugins-archive /
 
@@ -48,7 +29,6 @@ RUN ln -s mistral-base-source/* mistral \
     && if [ "$(ls /plugins)" ]; then \
         {{ macros.install_pip(mistral_base_plugins_pip_packages) }}; \
     fi
-{% endif %}
 
 COPY extend_start.sh /usr/local/bin/kolla_extend_start
 
diff --git a/docker/mistral/mistral-engine/Dockerfile.j2 b/docker/mistral/mistral-engine/Dockerfile.j2
index 76b8990d5..a761f2993 100644
--- a/docker/mistral/mistral-engine/Dockerfile.j2
+++ b/docker/mistral/mistral-engine/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 mistral_engine_packages = ['openstack-mistral-engine'] %}
-    {% elif base_package_type == 'deb' %}
-        {% set mistral_engine_packages = ['mistral-engine'] %}
-    {% endif %}
-{{ macros.install_packages(mistral_engine_packages | customizable("packages")) }}
-
-{% endif %}
 {% block mistral_engine_footer %}{% endblock %}
 {% block footer %}{% endblock %}
 
diff --git a/docker/mistral/mistral-event-engine/Dockerfile.j2 b/docker/mistral/mistral-event-engine/Dockerfile.j2
index 92a720dd4..e44562e09 100644
--- a/docker/mistral/mistral-event-engine/Dockerfile.j2
+++ b/docker/mistral/mistral-event-engine/Dockerfile.j2
@@ -7,16 +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 mistral_event_engine_packages = ['openstack-mistral-event-engine'] %}
-    {% elif base_package_type == 'deb' %}
-        {% set mistral_event_engine_packages = ['mistral-event-engine'] %}
-    {% endif %}
-
-{{ macros.install_packages(mistral_event_engine_packages | customizable("packages")) }}
-{% endif %}
-
 {% block mistral_event_engine_footer %}{% endblock %}
 {% block footer %}{% endblock %}
 
diff --git a/docker/mistral/mistral-executor/Dockerfile.j2 b/docker/mistral/mistral-executor/Dockerfile.j2
index 8d6571ed7..0b5eb35c2 100644
--- a/docker/mistral/mistral-executor/Dockerfile.j2
+++ b/docker/mistral/mistral-executor/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 mistral_executor_packages = ['openstack-mistral-executor'] %}
-    {% elif base_package_type == 'deb' %}
-        {% set mistral_executor_packages = ['mistral-executor'] %}
-    {% endif %}
-{{ macros.install_packages(mistral_executor_packages | customizable("packages")) }}
-
-{% endif %}
 {% block mistral_executor_footer %}{% endblock %}
 {% block footer %}{% endblock %}