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, 58 deletions

diff --git a/docker/trove/trove-api/Dockerfile.j2 b/docker/trove/trove-api/Dockerfile.j2
index c6a8aed73..5109479e6 100644
--- a/docker/trove/trove-api/Dockerfile.j2
+++ b/docker/trove/trove-api/Dockerfile.j2
@@ -7,17 +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 trove_api_packages = ['openstack-trove-api'] %}
-    {% elif base_package_type == 'deb' %}
-        {% set trove_api_packages = ['trove-api'] %}
-    {% endif %}
-
-{{ macros.install_packages(trove_api_packages | customizable("packages")) }}
-
-{% endif %}
-
 COPY extend_start.sh /usr/local/bin/kolla_trove_extend_start
 RUN chmod 755 /usr/local/bin/kolla_trove_extend_start
 
diff --git a/docker/trove/trove-base/Dockerfile.j2 b/docker/trove/trove-base/Dockerfile.j2
index cce401354..5dadfe53f 100644
--- a/docker/trove/trove-base/Dockerfile.j2
+++ b/docker/trove/trove-base/Dockerfile.j2
@@ -9,18 +9,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {{ macros.configure_user(name='trove') }}
 
-{% if install_type == 'binary' %}
-
-    {% if base_package_type == 'rpm' %}
-        {% set trove_base_packages = ['openstack-trove-common'] %}
-    {% elif base_package_type == 'deb' %}
-        {% set trove_base_packages = ['trove-common'] %}
-    {% endif %}
-
-{{ macros.install_packages(trove_base_packages | customizable("packages")) }}
-
-{% elif install_type == 'source' %}
-
 ADD trove-base-archive /trove-base-source
 
 {% set trove_base_pip_packages = [
@@ -33,8 +21,6 @@ RUN ln -s trove-base-source/* trove \
     && cp -r /trove/etc/trove/* /etc/trove/ \
     && chown -R trove: /etc/trove
 
-{% endif %}
-
 COPY extend_start.sh /usr/local/bin/kolla_extend_start
 
 RUN touch /usr/local/bin/kolla_trove_extend_start \
diff --git a/docker/trove/trove-conductor/Dockerfile.j2 b/docker/trove/trove-conductor/Dockerfile.j2
index 3eaf0ade7..bf187da81 100644
--- a/docker/trove/trove-conductor/Dockerfile.j2
+++ b/docker/trove/trove-conductor/Dockerfile.j2
@@ -7,17 +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 trove_conductor_packages = ['openstack-trove-conductor'] %}
-    {% elif base_package_type == 'deb' %}
-        {% set trove_conductor_packages = ['trove-conductor'] %}
-    {% endif %}
-
-{{ macros.install_packages(trove_conductor_packages | customizable("packages")) }}
-
-{% endif %}
-
 {% block trove_conductor_footer %}{% endblock %}
 {% block footer %}{% endblock %}
 
diff --git a/docker/trove/trove-guestagent/Dockerfile.j2 b/docker/trove/trove-guestagent/Dockerfile.j2
index 6f4082641..bee8eb7b6 100644
--- a/docker/trove/trove-guestagent/Dockerfile.j2
+++ b/docker/trove/trove-guestagent/Dockerfile.j2
@@ -7,17 +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 trove_guestagent_packages = ['openstack-trove-guestagent'] %}
-    {% elif base_package_type == 'deb' %}
-        {% set trove_guestagent_packages = ['trove-guestagent'] %}
-    {% endif %}
-
-{{ macros.install_packages(trove_guestagent_packages | customizable("packages")) }}
-
-{% endif %}
-
 {% block trove_guestagent_footer %}{% endblock %}
 {% block footer %}{% endblock %}
 
diff --git a/docker/trove/trove-taskmanager/Dockerfile.j2 b/docker/trove/trove-taskmanager/Dockerfile.j2
index 23ae8c104..b5722e26c 100644
--- a/docker/trove/trove-taskmanager/Dockerfile.j2
+++ b/docker/trove/trove-taskmanager/Dockerfile.j2
@@ -7,17 +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 trove_taskmanager_packages = ['openstack-trove-taskmanager'] %}
-    {% elif base_package_type == 'deb' %}
-        {% set trove_taskmanager_packages = ['trove-taskmanager'] %}
-    {% endif %}
-
-{{ macros.install_packages(trove_taskmanager_packages | customizable("packages")) }}
-
-{% endif %}
-
 {% block trove_taskmanager_footer %}{% endblock %}
 {% block footer %}{% endblock %}