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, 19 insertions, 57 deletions

diff --git a/docker/zun/zun-api/Dockerfile.j2 b/docker/zun/zun-api/Dockerfile.j2
index 75b278a2b..e43a1b87f 100644
--- a/docker/zun/zun-api/Dockerfile.j2
+++ b/docker/zun/zun-api/Dockerfile.j2
@@ -5,13 +5,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {% block zun_api_header %}{% endblock %}
 
-{% if install_type == 'binary' %}
-
-RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
-    && /bin/false
-
-{% endif %}
-
 COPY extend_start.sh /usr/local/bin/kolla_zun_extend_start
 RUN chmod 755 /usr/local/bin/kolla_zun_extend_start
 
diff --git a/docker/zun/zun-base/Dockerfile.j2 b/docker/zun/zun-base/Dockerfile.j2
index 67551c470..9e1c4f07c 100644
--- a/docker/zun/zun-base/Dockerfile.j2
+++ b/docker/zun/zun-base/Dockerfile.j2
@@ -10,31 +10,24 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {{ macros.enable_extra_repos(['openvswitch']) }}
 {{ macros.configure_user(name='zun') }}
 
-{% if install_type == 'binary' %}
+{% if base_package_type == 'rpm' %}
 
-RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
-    && /bin/false
-
-{% elif install_type == 'source' %}
-
-    {% if base_package_type == 'rpm' %}
-
-        {% set zun_base_packages = [
-            'numactl',
-        ] %}
+    {% set zun_base_packages = [
+        'numactl',
+    ] %}
 
 {{ macros.install_packages(zun_base_packages | customizable("packages")) }}
 RUN mkdir -p /var/www/cgi-bin/zun
 
-    {% elif base_package_type == 'deb' %}
+{% elif base_package_type == 'deb' %}
 
-        {% set zun_base_packages = [
-            'numactl',
-        ] %}
+    {% set zun_base_packages = [
+        'numactl',
+    ] %}
 
 {{ macros.install_packages(zun_base_packages | customizable("packages")) }}
 RUN mkdir -p /var/www/cgi-bin/zun
-    {% endif %}
+{% endif %}
 
 ADD zun-base-archive /zun-base-source
 
@@ -50,8 +43,6 @@ RUN ln -s zun-base-source/* zun \
     && chown -R zun: /etc/zun /var/www/cgi-bin/zun \
     && 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/zun/rootwrap.conf
 
-{% endif %}
-
 COPY zun_sudoers /etc/sudoers.d/kolla_zun_sudoers
 COPY extend_start.sh /usr/local/bin/kolla_extend_start
 
diff --git a/docker/zun/zun-cni-daemon/Dockerfile.j2 b/docker/zun/zun-cni-daemon/Dockerfile.j2
index 296996136..fee32b2fb 100644
--- a/docker/zun/zun-cni-daemon/Dockerfile.j2
+++ b/docker/zun/zun-cni-daemon/Dockerfile.j2
@@ -7,29 +7,21 @@ 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' %}
 
-RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
-    && /bin/false
+    {% set zun_cni_daemon_packages = [
+        'openvswitch'
+    ] %}
 
-{% elif install_type == 'source' %}
-    {% if base_package_type == 'rpm' %}
+{% elif base_package_type == 'deb' %}
 
-        {% set zun_cni_daemon_packages = [
-            'openvswitch'
-        ] %}
-
-    {% elif base_package_type == 'deb' %}
-
-        {% set zun_cni_daemon_packages = [
-            'bridge-utils',
-            'openvswitch-switch'
-        ] %}
-
-    {% endif %}
-{{ macros.install_packages(zun_cni_daemon_packages | customizable("packages")) }}
+    {% set zun_cni_daemon_packages = [
+        'bridge-utils',
+        'openvswitch-switch'
+    ] %}
 
 {% endif %}
+{{ macros.install_packages(zun_cni_daemon_packages | customizable("packages")) }}
 
 COPY zun_sudoers /etc/sudoers.d/kolla_zun_sudoers
 
diff --git a/docker/zun/zun-compute/Dockerfile.j2 b/docker/zun/zun-compute/Dockerfile.j2
index cf67fb203..ea6fa6d61 100644
--- a/docker/zun/zun-compute/Dockerfile.j2
+++ b/docker/zun/zun-compute/Dockerfile.j2
@@ -9,13 +9,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {{ macros.enable_extra_repos(['ceph']) }}
 
-{% if install_type == 'binary' %}
-
-RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
-    && /bin/false
-
-{% endif %}
-
 {% set zun_compute_packages = [
     'ceph-common',
     'e2fsprogs',
diff --git a/docker/zun/zun-wsproxy/Dockerfile.j2 b/docker/zun/zun-wsproxy/Dockerfile.j2
index 3663262f7..5e76b755f 100644
--- a/docker/zun/zun-wsproxy/Dockerfile.j2
+++ b/docker/zun/zun-wsproxy/Dockerfile.j2
@@ -5,13 +5,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {% block zun_wsproxy_header %}{% endblock %}
 
-{% if install_type == 'binary' %}
-
-RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
-    && /bin/false
-
-{% endif %}
-
 {% block zun_wsproxy_footer %}{% endblock %}
 {% block footer %}{% endblock %}