From 140ee6c83948f4661c04c464bb1d0d9cf2573026 Mon Sep 17 00:00:00 2001
From: Viktor Michalek <viktor.michalek@ultimum.io>
Date: Wed, 6 Nov 2019 23:22:01 +0100
Subject: Vitrage: build images for Debian

Change-Id: I73b1964b7b22f1a2d5637209b86559b79602131b
---
 docker/vitrage/vitrage-api/Dockerfile.j2      | 16 ++++++++++++++++
 docker/vitrage/vitrage-base/Dockerfile.j2     | 11 +++++++++++
 docker/vitrage/vitrage-graph/Dockerfile.j2    | 10 ++++++++++
 docker/vitrage/vitrage-ml/Dockerfile.j2       | 10 ++++++++++
 docker/vitrage/vitrage-notifier/Dockerfile.j2 | 10 ++++++++++
 kolla/image/build.py                          |  1 -
 6 files changed, 57 insertions(+), 1 deletion(-)

diff --git a/docker/vitrage/vitrage-api/Dockerfile.j2 b/docker/vitrage/vitrage-api/Dockerfile.j2
index 169f75fdf..1c1a3a1d1 100644
--- a/docker/vitrage/vitrage-api/Dockerfile.j2
+++ b/docker/vitrage/vitrage-api/Dockerfile.j2
@@ -32,11 +32,27 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
     && sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf
 
     {% elif base_package_type == 'deb' %}
+    {% if base_distro == 'debian' %}
+
+    {% set vitrage_api_packages = [
+            'apache2',
+            'libapache2-mod-wsgi-py3',
+            'python3-ldappool',
+            '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/ \
+    && echo > /etc/apache2/ports.conf
+
+    {% else %}
 
 RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
     && /bin/false
 
     {% endif %}
+    {% endif %}
 
 {% endif %}
 
diff --git a/docker/vitrage/vitrage-base/Dockerfile.j2 b/docker/vitrage/vitrage-base/Dockerfile.j2
index 689ef3729..ed217b77c 100644
--- a/docker/vitrage/vitrage-base/Dockerfile.j2
+++ b/docker/vitrage/vitrage-base/Dockerfile.j2
@@ -21,11 +21,22 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
     && chown -R vitrage: /var/www/cgi-bin/vitrage
 
     {% elif base_package_type == 'deb' %}
+    {% if base_distro == 'debian' %}
+
+    {% 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' %}
 
diff --git a/docker/vitrage/vitrage-graph/Dockerfile.j2 b/docker/vitrage/vitrage-graph/Dockerfile.j2
index 1621a4d28..8d92d54dd 100644
--- a/docker/vitrage/vitrage-graph/Dockerfile.j2
+++ b/docker/vitrage/vitrage-graph/Dockerfile.j2
@@ -16,11 +16,21 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {{ 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 %}
 
diff --git a/docker/vitrage/vitrage-ml/Dockerfile.j2 b/docker/vitrage/vitrage-ml/Dockerfile.j2
index 45d6b1c47..bde6127da 100644
--- a/docker/vitrage/vitrage-ml/Dockerfile.j2
+++ b/docker/vitrage/vitrage-ml/Dockerfile.j2
@@ -16,11 +16,21 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {{ 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 %}
 
diff --git a/docker/vitrage/vitrage-notifier/Dockerfile.j2 b/docker/vitrage/vitrage-notifier/Dockerfile.j2
index 814507a3f..a7da5e74d 100644
--- a/docker/vitrage/vitrage-notifier/Dockerfile.j2
+++ b/docker/vitrage/vitrage-notifier/Dockerfile.j2
@@ -16,11 +16,21 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {{ 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 %}
 
diff --git a/kolla/image/build.py b/kolla/image/build.py
index 701bd491e..3405d3ec0 100755
--- a/kolla/image/build.py
+++ b/kolla/image/build.py
@@ -201,7 +201,6 @@ UNBUILDABLE_IMAGES = {
         "tacker-base",
         "tripleoclient",
         "trove-base",
-        "vitrage-base",
         "neutron-mlnx-agent",
     },
 
-- 
cgit v1.2.3