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

6 files changed, 15 insertions, 71 deletions

diff --git a/docker/monasca/monasca-agent/Dockerfile.j2 b/docker/monasca/monasca-agent/Dockerfile.j2
index 24a7f6c96..6f5c7dd90 100644
--- a/docker/monasca/monasca-agent/Dockerfile.j2
+++ b/docker/monasca/monasca-agent/Dockerfile.j2
@@ -7,13 +7,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {% import "macros.j2" as macros with context %}
 
-{% if install_type == 'binary' %}
-
-RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
-    && /bin/false
-
-{% elif install_type == 'source' %}
-
 ADD monasca-agent-archive /monasca-agent-source
 
 {% set monasca_agent_pip_packages = [
@@ -24,11 +17,8 @@ ADD monasca-agent-archive /monasca-agent-source
 RUN ln -s monasca-agent-source/* monasca-agent \
     && {{ macros.install_pip(monasca_agent_pip_packages | customizable("pip_packages")) }}
 
-{% endif %}
-
 {% block monasca_agent_footer %}{% endblock %}
 
 {% block footer %}{% endblock %}
 
 USER monasca
-
diff --git a/docker/monasca/monasca-api/Dockerfile.j2 b/docker/monasca/monasca-api/Dockerfile.j2
index 9469908f3..5e83a6759 100644
--- a/docker/monasca/monasca-api/Dockerfile.j2
+++ b/docker/monasca/monasca-api/Dockerfile.j2
@@ -7,20 +7,13 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {% import "macros.j2" as macros with context %}
 
-{% if install_type == 'binary' %}
-
-RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
-    && /bin/false
-
-{% elif install_type == 'source' %}
-
-    {% if base_package_type == 'rpm' %}
-        {% set monasca_api_packages = [
-        ] %}
-    {% elif base_package_type == 'deb' %}
-        {% set monasca_api_packages = [
-        ] %}
-    {% endif %}
+{% if base_package_type == 'rpm' %}
+    {% set monasca_api_packages = [
+    ] %}
+{% elif base_package_type == 'deb' %}
+    {% set monasca_api_packages = [
+    ] %}
+{% endif %}
 {{ macros.install_packages(monasca_api_packages | customizable("packages")) }}
 
 ADD monasca-api-archive /monasca-api-source
@@ -33,8 +26,6 @@ ADD monasca-api-archive /monasca-api-source
 RUN ln -s monasca-api-source/* monasca-api \
     && {{ macros.install_pip(monasca_api_pip_packages | customizable("pip_packages")) }}
 
-{% endif %}
-
 COPY extend_start.sh /usr/local/bin/kolla_monasca_extend_start
 RUN chmod 755 /usr/local/bin/kolla_monasca_extend_start
 
diff --git a/docker/monasca/monasca-base/Dockerfile.j2 b/docker/monasca/monasca-base/Dockerfile.j2
index bf4284efe..2ce6aed36 100644
--- a/docker/monasca/monasca-base/Dockerfile.j2
+++ b/docker/monasca/monasca-base/Dockerfile.j2
@@ -9,20 +9,14 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {{ macros.configure_user(name='monasca') }}
 
-{% if install_type == 'binary' %}
-
-RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
-    && /bin/false
-
-{% elif install_type == 'source' %}
-    {% if base_package_type == 'rpm' %}
-        {% set monasca_base_packages = [
-        ] %}
-    {% elif base_package_type == 'deb' %}
-        {% set monasca_base_packages = [
-            'librdkafka-dev'
-        ] %}
-    {% endif %}
+{% if base_package_type == 'rpm' %}
+    {% set monasca_base_packages = [
+    ] %}
+{% elif base_package_type == 'deb' %}
+    {% set monasca_base_packages = [
+        'librdkafka-dev'
+    ] %}
+{% endif %}
 
 {{ macros.install_packages(monasca_base_packages | customizable("packages")) }}
 
@@ -37,8 +31,6 @@ RUN {{ macros.install_pip(monasca_base_pip_packages | customizable("pip_packages
     && chown -R monasca: /etc/monasca
 {% endblock %}
 
-{% endif %}
-
 COPY extend_start.sh /usr/local/bin/kolla_extend_start
 
 RUN touch /usr/local/bin/kolla_monasca_extend_start \
diff --git a/docker/monasca/monasca-notification/Dockerfile.j2 b/docker/monasca/monasca-notification/Dockerfile.j2
index e5bf0ea58..0899b95c5 100644
--- a/docker/monasca/monasca-notification/Dockerfile.j2
+++ b/docker/monasca/monasca-notification/Dockerfile.j2
@@ -7,13 +7,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {% import "macros.j2" as macros with context %}
 
-{% if install_type == 'binary' %}
-
-RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
-    && /bin/false
-
-{% elif install_type == 'source' %}
-
 ADD monasca-notification-archive /monasca-notification-source
 
 {% set monasca_notification_pip_packages = [
@@ -23,11 +16,8 @@ ADD monasca-notification-archive /monasca-notification-source
 RUN ln -s monasca-notification-source/* monasca-notification \
     && {{ macros.install_pip(monasca_notification_pip_packages | customizable("pip_packages")) }}
 
-{% endif %}
-
 {% block monasca_notification_footer %}{% endblock %}
 
 {% block footer %}{% endblock %}
 
 USER monasca
-
diff --git a/docker/monasca/monasca-persister/Dockerfile.j2 b/docker/monasca/monasca-persister/Dockerfile.j2
index a075ca8f4..9194768a0 100644
--- a/docker/monasca/monasca-persister/Dockerfile.j2
+++ b/docker/monasca/monasca-persister/Dockerfile.j2
@@ -7,13 +7,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {% import "macros.j2" as macros with context %}
 
-{% if install_type == 'binary' %}
-
-RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
-    && /bin/false
-
-{% elif install_type == 'source' %}
-
 ADD monasca-persister-archive /monasca-persister-source
 
 {% set monasca_persister_pip_packages = [
@@ -26,11 +19,8 @@ ADD monasca-persister-archive /monasca-persister-source
 RUN ln -s monasca-persister-source/* monasca-persister \
     && {{ macros.install_pip(monasca_persister_pip_packages | customizable("pip_packages")) }}
 
-{% endif %}
-
 {% block monasca_persister_footer %}{% endblock %}
 
 {% block footer %}{% endblock %}
 
 USER monasca
-
diff --git a/docker/monasca/monasca-thresh/Dockerfile.j2 b/docker/monasca/monasca-thresh/Dockerfile.j2
index acf5a9942..d4a7dcae4 100644
--- a/docker/monasca/monasca-thresh/Dockerfile.j2
+++ b/docker/monasca/monasca-thresh/Dockerfile.j2
@@ -10,13 +10,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {{ macros.add_binary_source_envs() }}
 {{ macros.configure_user(name='monasca') }}
 
-{% if install_type == 'binary' %}
-
-RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
-    && /bin/false
-
-{% elif install_type == 'source' %}
-
 {% if base_package_type == 'rpm' %}
     {% set monasca_thresh_packages = [
         'maven',
@@ -62,8 +55,6 @@ RUN cd /monasca-common-source/java \
     && mvn clean package {{ build_opts|join(' ') }}
 {% endblock %}
 
-{% endif %}
-
 # Overwrite the script inherited from Storm
 COPY extend_start.sh /usr/local/bin/kolla_extend_start