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

7 files changed, 8 insertions, 95 deletions

diff --git a/docker/designate/designate-api/Dockerfile.j2 b/docker/designate/designate-api/Dockerfile.j2
index 38b726aec..085fbd64c 100644
--- a/docker/designate/designate-api/Dockerfile.j2
+++ b/docker/designate/designate-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 designate_api_packages = ['openstack-designate-api'] %}
-    {% elif base_package_type == 'deb' %}
-       {% set designate_api_packages = ['designate-api'] %}
-    {% endif %}
-{{ macros.install_packages(designate_api_packages | customizable("packages")) }}
-{% endif %}
-
 {% block designate_api_footer %}{% endblock %}
 {% block footer %}{% endblock %}
 
diff --git a/docker/designate/designate-base/Dockerfile.j2 b/docker/designate/designate-base/Dockerfile.j2
index ccad55d73..385c4d57b 100644
--- a/docker/designate/designate-base/Dockerfile.j2
+++ b/docker/designate/designate-base/Dockerfile.j2
@@ -9,27 +9,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {{ macros.configure_user(name='designate') }}
 
-{% if install_type == 'binary' %}
-    {% if base_package_type == 'rpm' %}
-       {% set designate_base_packages = [
-            'openstack-designate-common',
-            'python3-oslo-reports',
-            'python3-suds',
-            'python3-tooz'
-        ] %}
-
-{{ macros.install_packages(designate_base_packages | customizable("packages")) }}
-    {% elif base_package_type == 'deb' %}
-       {% set designate_base_packages = [
-            'designate-common',
-            'python3-tooz'
-        ] %}
-
-{{ macros.install_packages(designate_base_packages | customizable("packages")) }}
-
-    {% endif %}
-{% elif install_type == 'source' %}
-
 {% set designate_base_pip_packages = [
     '/designate'
 ] %}
@@ -42,7 +21,6 @@ RUN ln -s designate-base-source/* designate \
     && mv /etc/designate/rootwrap.conf.sample /etc/designate/rootwrap.conf \
     && chown -R designate: /etc/designate \
     && sed -i 's|^exec_dirs.*|exec_dirs=/var/lib/kolla/venv/bin,/sbin,/usr/sbin,/bin,/usr/bin,/usr/local/bin,/usr/local/sbin|g' /etc/designate/rootwrap.conf
-{% endif %}
 
 COPY designate_sudoers /etc/sudoers.d/kolla_designate_sudoers
 COPY extend_start.sh /usr/local/bin/kolla_extend_start
diff --git a/docker/designate/designate-central/Dockerfile.j2 b/docker/designate/designate-central/Dockerfile.j2
index e8f3addbd..b7c871297 100644
--- a/docker/designate/designate-central/Dockerfile.j2
+++ b/docker/designate/designate-central/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 designate_central_packages = ['openstack-designate-central'] %}
-    {% elif base_package_type == 'deb'%}
-       {% set designate_central_packages = ['designate-central'] %}
-    {% endif %}
-{{ macros.install_packages(designate_central_packages | customizable("packages")) }}
-{% endif %}
-
 COPY extend_start.sh /usr/local/bin/kolla_designate_extend_start
 RUN chmod 755 /usr/local/bin/kolla_designate_extend_start
 
diff --git a/docker/designate/designate-mdns/Dockerfile.j2 b/docker/designate/designate-mdns/Dockerfile.j2
index 13c22bf6f..6ad442bb3 100644
--- a/docker/designate/designate-mdns/Dockerfile.j2
+++ b/docker/designate/designate-mdns/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 designate_mdns_packages = ['openstack-designate-mdns'] %}
-    {% elif base_package_type == 'deb' %}
-       {% set designate_mdns_packages = ['designate-mdns'] %}
-    {% endif %}
-{{ macros.install_packages(designate_mdns_packages | customizable("packages")) }}
-{% endif %}
-
 {% block designate_mdns_footer %}{% endblock %}
 {% block footer %}{% endblock %}
 
diff --git a/docker/designate/designate-producer/Dockerfile.j2 b/docker/designate/designate-producer/Dockerfile.j2
index 2c08c6b53..3a2701931 100644
--- a/docker/designate/designate-producer/Dockerfile.j2
+++ b/docker/designate/designate-producer/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 designate_producer_packages = ['openstack-designate-producer'] %}
-    {% elif base_package_type == 'deb' %}
-       {% set designate_producer_packages = ['designate-producer'] %}
-    {% endif %}
-{{ macros.install_packages(designate_producer_packages | customizable("packages")) }}
-{% endif %}
-
 {% block designate_producer_footer %}{% endblock %}
 {% block footer %}{% endblock %}
 
diff --git a/docker/designate/designate-sink/Dockerfile.j2 b/docker/designate/designate-sink/Dockerfile.j2
index 07a743c00..aa2a25942 100644
--- a/docker/designate/designate-sink/Dockerfile.j2
+++ b/docker/designate/designate-sink/Dockerfile.j2
@@ -7,21 +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 designate_sink_packages = [
-            'openstack-designate-sink',
-            'python3-designateclient'
-        ] %}
-    {% elif base_package_type == 'deb' %}
-       {% set designate_sink_packages = [
-            'designate-sink',
-            'python3-designateclient'
-        ] %}
-    {% endif %}
-{{ macros.install_packages(designate_sink_packages | customizable("packages")) }}
-{% endif %}
-
 {% block designate_sink_footer %}{% endblock %}
 {% block footer %}{% endblock %}
 
diff --git a/docker/designate/designate-worker/Dockerfile.j2 b/docker/designate/designate-worker/Dockerfile.j2
index 05432b37f..b050f87d0 100644
--- a/docker/designate/designate-worker/Dockerfile.j2
+++ b/docker/designate/designate-worker/Dockerfile.j2
@@ -8,28 +8,14 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {% import "macros.j2" as macros with context %}
 
 # The bind9 package here is only to provide the rndc binary.
-{% if install_type == 'binary' %}
-    {% if base_package_type == 'rpm' %}
-       {% set designate_worker_packages = [
-            'bind',
-            'openstack-designate-worker'
-        ] %}
-    {% elif base_package_type == 'deb' %}
-       {% set designate_worker_packages = [
-            'bind9',
-            'designate-worker'
-        ] %}
-    {% endif %}
-{% elif install_type == 'source' %}
-    {% if base_package_type == 'rpm' %}
-       {% set designate_worker_packages = [
-            'bind'
-        ] %}
-    {% elif base_package_type == 'deb' %}
-       {% set designate_worker_packages = [
-            'bind9'
-        ] %}
-    {% endif %}
+{% if base_package_type == 'rpm' %}
+    {% set designate_worker_packages = [
+        'bind'
+    ] %}
+{% elif base_package_type == 'deb' %}
+    {% set designate_worker_packages = [
+        'bind9'
+    ] %}
 {% endif %}
 {{ macros.install_packages(designate_worker_packages | customizable("packages")) }}