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, 5 insertions, 190 deletions

diff --git a/docker/vitrage/vitrage-api/Dockerfile.j2 b/docker/vitrage/vitrage-api/Dockerfile.j2
index e579f05fa..b50e1a613 100644
--- a/docker/vitrage/vitrage-api/Dockerfile.j2
+++ b/docker/vitrage/vitrage-api/Dockerfile.j2
@@ -7,38 +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 vitrage_api_packages = [
-            'openstack-vitrage-api',
-        ] %}
-
-{{ macros.install_packages(vitrage_api_packages | customizable("packages")) }}
-
-    {% elif base_package_type == 'deb' %}
-    {% if base_distro == 'debian' %}
-
-    {% set vitrage_api_packages = [
-            'vitrage-api'
-        ] %}
-
-{{ macros.install_packages(vitrage_api_packages | customizable("packages")) }}
-RUN mkdir -p /var/www/cgi-bin/vitrage \
-    && cp -a /usr/lib/python3/dist-packages/vitrage/api/app.wsgi /var/www/cgi-bin/vitrage/
-
-    {% else %}
-
-RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
-    && /bin/false
-
-    {% endif %}
-    {% endif %}
-
-{% endif %}
-
-
 COPY extend_start.sh /usr/local/bin/kolla_vitrage_extend_start
 RUN chmod 755 /usr/local/bin/kolla_vitrage_extend_start
 
diff --git a/docker/vitrage/vitrage-base/Dockerfile.j2 b/docker/vitrage/vitrage-base/Dockerfile.j2
index 89b3d04d0..79fa8f770 100644
--- a/docker/vitrage/vitrage-base/Dockerfile.j2
+++ b/docker/vitrage/vitrage-base/Dockerfile.j2
@@ -10,53 +10,18 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {{ macros.enable_extra_repos(['powertools']) }}
 {{ macros.configure_user(name='vitrage') }}
 
-{% if install_type == 'binary' %}
-
-    {% if base_package_type == 'rpm' %}
-
-        {% set vitrage_base_packages = [
-            'openstack-vitrage-common'
-        ] %}
-
-{{ macros.install_packages(vitrage_base_packages | customizable("packages")) }} \
-    && mkdir -p /var/www/cgi-bin/vitrage \
-    && cp -a /usr/lib/python{{ distro_python_version }}/site-packages/vitrage/api/app.wsgi /var/www/cgi-bin/vitrage/ \
-    && chown -R vitrage: /var/www/cgi-bin/vitrage
-
-    {% elif base_package_type == 'deb' %}
-    {% if base_distro == 'debian' %}
+{% if base_package_type == 'rpm' %}
 
     {% set vitrage_base_packages = [
-        'python3-vitrage',
-        'vitrage-common'
     ] %}
 
-{{ macros.install_packages(vitrage_base_packages | customizable("packages")) }}
-
-    {% else %}
-
-RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
-    && /bin/false
-
-    {% endif %}
-    {% endif %}
-
-{% elif install_type == 'source' %}
-
-    {% if base_package_type == 'rpm' %}
+{% elif base_package_type == 'deb' %}
 
-        {% set vitrage_base_packages = [
-        ] %}
-
-{{ macros.install_packages(vitrage_base_packages | customizable("packages")) }}
-
-    {% elif base_package_type == 'deb' %}
-
-        {% set vitrage_base_packages = [
-        ] %}
+    {% set vitrage_base_packages = [
+    ] %}
 
-{{ macros.install_packages(vitrage_base_packages | customizable("packages")) }}
 {% endif %}
+{{ macros.install_packages(vitrage_base_packages | customizable("packages")) }}
 
 {% set vitrage_base_pip_packages = [
     '/vitrage'
@@ -70,8 +35,6 @@ RUN ln -s vitrage-base-source/* vitrage \
     && cp /vitrage/vitrage/api/app.wsgi /var/www/cgi-bin/vitrage \
     && chown -R vitrage: /etc/vitrage /var/www/cgi-bin/vitrage
 
-{% endif %}
-
 COPY extend_start.sh /usr/local/bin/kolla_extend_start
 RUN touch /usr/local/bin/kolla_vitrage_extend_start \
     && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_vitrage_extend_start
diff --git a/docker/vitrage/vitrage-graph/Dockerfile.j2 b/docker/vitrage/vitrage-graph/Dockerfile.j2
index bf2d13982..aea406f94 100644
--- a/docker/vitrage/vitrage-graph/Dockerfile.j2
+++ b/docker/vitrage/vitrage-graph/Dockerfile.j2
@@ -7,35 +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 vitrage_graph_packages = [
-            'openstack-vitrage-graph'
-        ] %}
-
-{{ macros.install_packages(vitrage_graph_packages | customizable("packages")) }}
-
-    {% elif base_package_type == 'deb' %}
-    {% if base_distro == 'debian' %}
-
-        {% set vitrage_graph_packages = [
-            'vitrage-graph'
-        ] %}
-
-{{ macros.install_packages(vitrage_graph_packages | customizable("packages")) }}
-
-    {% else %}
-
-RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
-    && /bin/false
-
-    {% endif %}
-    {% endif %}
-
-{% endif %}
-
 {% block vitrage_graph_footer %}{% endblock %}
 {% block footer %}{% endblock %}
 
diff --git a/docker/vitrage/vitrage-ml/Dockerfile.j2 b/docker/vitrage/vitrage-ml/Dockerfile.j2
index 52a4caeb2..aea3ec678 100644
--- a/docker/vitrage/vitrage-ml/Dockerfile.j2
+++ b/docker/vitrage/vitrage-ml/Dockerfile.j2
@@ -7,35 +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 vitrage_ml_packages = [
-            'openstack-vitrage-ml'
-        ] %}
-
-{{ macros.install_packages(vitrage_ml_packages | customizable("packages")) }}
-
-    {% elif base_package_type == 'deb' %}
-    {% if base_distro == 'debian' %}
-
-        {% set vitrage_ml_packages = [
-            'vitrage-ml'
-        ] %}
-
-{{ macros.install_packages(vitrage_ml_packages | customizable("packages")) }}
-
-    {% else %}
-
-RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
-    && /bin/false
-
-    {% endif %}
-    {% endif %}
-
-{% endif %}
-
 {% block vitrage_ml_footer %}{% endblock %}
 {% block footer %}{% endblock %}
 
diff --git a/docker/vitrage/vitrage-notifier/Dockerfile.j2 b/docker/vitrage/vitrage-notifier/Dockerfile.j2
index 5f9649c40..2af6f39d8 100644
--- a/docker/vitrage/vitrage-notifier/Dockerfile.j2
+++ b/docker/vitrage/vitrage-notifier/Dockerfile.j2
@@ -7,35 +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 vitrage_notifier_packages = [
-            'openstack-vitrage-notifier'
-        ] %}
-
-{{ macros.install_packages(vitrage_notifier_packages | customizable("packages")) }}
-
-    {% elif base_package_type == 'deb' %}
-    {% if base_distro == 'debian' %}
-
-        {% set vitrage_notifier_packages = [
-            'vitrage-notifier'
-        ] %}
-
-{{ macros.install_packages(vitrage_notifier_packages | customizable("packages")) }}
-
-    {% else %}
-
-RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
-    && /bin/false
-
-    {% endif %}
-    {% endif %}
-
-{% endif %}
-
 {% block vitrage_notifier_footer %}{% endblock %}
 {% block footer %}{% endblock %}
 
diff --git a/docker/vitrage/vitrage-persistor/Dockerfile.j2 b/docker/vitrage/vitrage-persistor/Dockerfile.j2
index f07d930f3..16bdbe0b8 100644
--- a/docker/vitrage/vitrage-persistor/Dockerfile.j2
+++ b/docker/vitrage/vitrage-persistor/Dockerfile.j2
@@ -7,35 +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 vitrage_persistor_packages = [
-            'openstack-vitrage-persistor'
-        ] %}
-
-{{ macros.install_packages(vitrage_persistor_packages | customizable("packages")) }}
-
-    {% elif base_package_type == 'deb' %}
-    {% if base_distro == 'debian' %}
-
-        {% set vitrage_persistor_packages = [
-            'vitrage-persistor'
-        ] %}
-
-{{ macros.install_packages(vitrage_persistor_packages | customizable("packages")) }}
-
-    {% else %}
-
-RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
-    && /bin/false
-
-    {% endif %}
-    {% endif %}
-
-{% endif %}
-
 {% block vitrage_persistor_footer %}{% endblock %}
 {% block footer %}{% endblock %}