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, 0 insertions, 64 deletions

diff --git a/docker/senlin/senlin-api/Dockerfile.j2 b/docker/senlin/senlin-api/Dockerfile.j2
index 49b95191c..d7e8f6abd 100644
--- a/docker/senlin/senlin-api/Dockerfile.j2
+++ b/docker/senlin/senlin-api/Dockerfile.j2
@@ -7,18 +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 senlin_api_packages = ['openstack-senlin-api'] %}
-
-    {% elif base_package_type == 'deb' %}
-        {% set senlin_api_packages = ['senlin-api'] %}
-    {% endif %}
-
-{{ macros.install_packages(senlin_api_packages | customizable("packages")) }}
-
-{% endif %}
-
 COPY extend_start.sh /usr/local/bin/kolla_senlin_extend_start
 RUN chmod 755 /usr/local/bin/kolla_senlin_extend_start
 
diff --git a/docker/senlin/senlin-base/Dockerfile.j2 b/docker/senlin/senlin-base/Dockerfile.j2
index 9ee4a8b53..17adf0f4c 100644
--- a/docker/senlin/senlin-base/Dockerfile.j2
+++ b/docker/senlin/senlin-base/Dockerfile.j2
@@ -9,18 +9,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {{ macros.configure_user(name='senlin') }}
 
-{% if install_type == 'binary' %}
-    {% if base_package_type == 'rpm' %}
-        {% set senlin_base_packages = ['openstack-senlin-common'] %}
-
-    {% elif base_package_type == 'deb' %}
-        {% set senlin_base_packages = ['senlin-common'] %}
-    {% endif %}
-
-{{ macros.install_packages(senlin_base_packages | customizable("packages")) }}
-
-{% elif install_type == 'source' %}
-
 ADD senlin-base-archive /senlin-base-source
 
 {% set senlin_base_pip_packages = [
@@ -33,8 +21,6 @@ RUN ln -s senlin-base-source/* senlin \
     && cp -r /senlin/etc/senlin/* /etc/senlin \
     && chown -R senlin: /etc/senlin
 
-{% endif %}
-
 COPY extend_start.sh /usr/local/bin/kolla_extend_start
 
 RUN touch /usr/local/bin/kolla_senlin_extend_start \
diff --git a/docker/senlin/senlin-conductor/Dockerfile.j2 b/docker/senlin/senlin-conductor/Dockerfile.j2
index 61d3a4e84..a4dd6bc5f 100644
--- a/docker/senlin/senlin-conductor/Dockerfile.j2
+++ b/docker/senlin/senlin-conductor/Dockerfile.j2
@@ -7,18 +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 senlin_conductor_packages = ['openstack-senlin-conductor'] %}
-
-    {% elif base_package_type == 'deb' %}
-        {% set senlin_conductor_packages = ['senlin-conductor'] %}
-    {% endif %}
-
-{{ macros.install_packages(senlin_conductor_packages | customizable("packages")) }}
-
-{% endif %}
-
 {% block senlin_conductor_footer %}{% endblock %}
 {% block footer %}{% endblock %}
 
diff --git a/docker/senlin/senlin-engine/Dockerfile.j2 b/docker/senlin/senlin-engine/Dockerfile.j2
index 8bc46f871..f3a9eac25 100644
--- a/docker/senlin/senlin-engine/Dockerfile.j2
+++ b/docker/senlin/senlin-engine/Dockerfile.j2
@@ -7,18 +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 senlin_engine_packages = ['openstack-senlin-engine'] %}
-
-    {% elif base_package_type == 'deb' %}
-        {% set senlin_engine_packages = ['senlin-engine'] %}
-    {% endif %}
-
-{{ macros.install_packages(senlin_engine_packages | customizable("packages")) }}
-
-{% endif %}
-
 {% block senlin_engine_footer %}{% endblock %}
 {% block footer %}{% endblock %}
 
diff --git a/docker/senlin/senlin-health-manager/Dockerfile.j2 b/docker/senlin/senlin-health-manager/Dockerfile.j2
index 25f476180..8a37b2beb 100644
--- a/docker/senlin/senlin-health-manager/Dockerfile.j2
+++ b/docker/senlin/senlin-health-manager/Dockerfile.j2
@@ -5,20 +5,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {% block senlin_health_manager_header %}{% endblock %}
 
-{% import "macros.j2" as macros with context %}
-
-{% if install_type == 'binary' %}
-    {% if base_package_type == 'rpm' %}
-        {% set senlin_health_manager_packages = ['openstack-senlin-health-manager'] %}
-
-    {% elif base_package_type == 'deb' %}
-        {% set senlin_health_manager_packages = ['senlin-health-manager'] %}
-    {% endif %}
-
-{{ macros.install_packages(senlin_health_manager_packages | customizable("packages")) }}
-
-{% endif %}
-
 {% block senlin_health_manager_footer %}{% endblock %}
 {% block footer %}{% endblock %}