Merge "Build Masakari for Ubuntu binary"

8 files changed, 88 insertions, 17 deletions

diff --git a/doc/source/matrix_aarch64.csv b/doc/source/matrix_aarch64.csv
index 00f5b9056..7ccb90898 100644
--- a/doc/source/matrix_aarch64.csv
+++ b/doc/source/matrix_aarch64.csv
@@ -39,7 +39,7 @@ logstash,C,C,C,C,N,C
 magnum,C,C,C,C,N,C
 manila,C,C,C,C,N,C
 mariadb,C,C,C,C,N,C
-masakari,N,C,N,C,N,C
+masakari,N,C,C,C,N,C
 memcached,C,C,C,C,N,C
 mistral,C,C,C,C,N,C
 monasca,N,N,N,N,N,N
diff --git a/doc/source/matrix_x86.csv b/doc/source/matrix_x86.csv
index 82b402c12..aa92c4491 100644
--- a/doc/source/matrix_x86.csv
+++ b/doc/source/matrix_x86.csv
@@ -40,7 +40,7 @@ logstash,C,C,C,C,C,C
 magnum,C,C,C,C,C,C
 manila,C,C,C,C,C,C
 mariadb,T,T,T,T,C,T
-masakari,N,T,N,T,N,C
+masakari,N,T,C,T,N,C
 memcached,T,T,T,T,C,C
 mistral,C,T,N,C,C,C
 monasca,N,C,N,C,N,N
diff --git a/docker/masakari/masakari-api/Dockerfile.j2 b/docker/masakari/masakari-api/Dockerfile.j2
index f8391ef5a..1e2ca75a3 100644
--- a/docker/masakari/masakari-api/Dockerfile.j2
+++ b/docker/masakari/masakari-api/Dockerfile.j2
@@ -5,10 +5,29 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {% block masakari_api_header %}{% endblock %}
 
+{% import "macros.j2" as macros with context %}
+
 {% if install_type == 'binary' %}
 
-RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
-    && /bin/false
+    {% if base_package_type == 'rpm' %}
+
+        {# not available #}
+        {% set masakari_base_packages = [
+        ] %}
+
+    {% elif base_package_type == 'deb' %}
+
+        {% set masakari_base_packages = [
+            'masakari-api',
+        ] %}
+
+    {% endif %}
+
+{{ macros.install_packages(masakari_base_packages | customizable("packages")) }}
+
+    {% if base_package_type == 'deb' %}
+RUN rm -f /etc/apache2/sites-enabled/masakari-api.conf
+    {% endif %}
 
 {% endif %}
 
diff --git a/docker/masakari/masakari-base/Dockerfile.j2 b/docker/masakari/masakari-base/Dockerfile.j2
index fe73a260c..cd558d053 100644
--- a/docker/masakari/masakari-base/Dockerfile.j2
+++ b/docker/masakari/masakari-base/Dockerfile.j2
@@ -11,8 +11,21 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {% if install_type == 'binary' %}
 
-RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
-    && /bin/false
+    {% if base_package_type == 'rpm' %}
+
+        {# not available #}
+        {% set masakari_base_packages = [
+        ] %}
+
+    {% elif base_package_type == 'deb' %}
+
+        {% set masakari_base_packages = [
+            'python3-masakari',
+        ] %}
+
+    {% endif %}
+
+{{ macros.install_packages(masakari_base_packages | customizable("packages")) }}
 
 {% elif install_type == 'source' %}
 
@@ -21,16 +34,16 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
         {% set masakari_base_packages = [
         ] %}
 
-{{ macros.install_packages(masakari_base_packages | customizable("packages")) }}
-RUN mkdir -p /var/www/cgi-bin/masakari
     {% elif base_package_type == 'deb' %}
 
         {% set masakari_base_packages = [
         ] %}
 
+    {% endif %}
+
 {{ macros.install_packages(masakari_base_packages | customizable("packages")) }}
+
 RUN mkdir -p /var/www/cgi-bin/masakari
-    {% endif %}
 
 ADD masakari-base-archive /masakari-base-source
 
@@ -42,14 +55,14 @@ RUN ln -s masakari-base-source/* masakari \
     && {{ macros.install_pip(masakari_base_pip_packages | customizable("pip_packages")) }} \
     && mkdir -p /etc/masakari /var/www/cgi-bin/masakari \
     && cp -r /masakari/etc/masakari/* /etc/masakari/ \
-    && chown -R masakari: /etc/masakari /var/www/cgi-bin/masakari
+    && chown -R masakari: /etc/masakari /var/www/cgi-bin/masakari \
+    && chmod 755 /var/www/cgi-bin/masakari
 
 {% endif %}
 
 COPY extend_start.sh /usr/local/bin/kolla_extend_start
 
 RUN touch /usr/local/bin/kolla_masakari_extend_start \
-    && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_masakari_extend_start \
-    && chmod 755 /var/www/cgi-bin/masakari
+    && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_masakari_extend_start
 
 {% block masakari_base_footer %}{% endblock %}
diff --git a/docker/masakari/masakari-engine/Dockerfile.j2 b/docker/masakari/masakari-engine/Dockerfile.j2
index ba9e95bc3..fc9dd8a9d 100644
--- a/docker/masakari/masakari-engine/Dockerfile.j2
+++ b/docker/masakari/masakari-engine/Dockerfile.j2
@@ -5,10 +5,25 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {% block masakari_engine_header %}{% endblock %}
 
+{% import "macros.j2" as macros with context %}
+
 {% if install_type == 'binary' %}
 
-RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
-    && /bin/false
+    {% if base_package_type == 'rpm' %}
+
+        {# not available #}
+        {% set masakari_base_packages = [
+        ] %}
+
+    {% elif base_package_type == 'deb' %}
+
+        {% set masakari_base_packages = [
+            'masakari-engine',
+        ] %}
+
+    {% endif %}
+
+{{ macros.install_packages(masakari_base_packages | customizable("packages")) }}
 
 {% endif %}
 
diff --git a/docker/masakari/masakari-monitors/Dockerfile.j2 b/docker/masakari/masakari-monitors/Dockerfile.j2
index d7098f737..9afd6217a 100644
--- a/docker/masakari/masakari-monitors/Dockerfile.j2
+++ b/docker/masakari/masakari-monitors/Dockerfile.j2
@@ -11,8 +11,24 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {% if install_type == 'binary' %}
 
-RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
-    && /bin/false
+    {% if base_package_type == 'rpm' %}
+
+        {# not available #}
+        {% set masakari_base_packages = [
+        ] %}
+
+    {% elif base_package_type == 'deb' %}
+
+        {% set masakari_base_packages = [
+            'masakari-host-monitor',
+            'masakari-instance-monitor',
+            'masakari-introspective-instance-monitor',
+            'masakari-process-monitor',
+        ] %}
+
+    {% endif %}
+
+{{ macros.install_packages(masakari_base_packages | customizable("packages")) }}
 
 {% elif install_type == 'source' %}
 
diff --git a/kolla/image/build.py b/kolla/image/build.py
index 9accb7846..f1adf2ecf 100755
--- a/kolla/image/build.py
+++ b/kolla/image/build.py
@@ -102,7 +102,6 @@ UNBUILDABLE_IMAGES = {
         "cyborg-base",
         "freezer-base",
         "kuryr-base",
-        "masakari-base",
         "monasca-base",
         "monasca-thresh",
         "solum-base",
@@ -159,9 +158,14 @@ UNBUILDABLE_IMAGES = {
         "kibana",         # no binary package
     },
 
+    "centos+binary": {
+        "masakari-base",
+    },
+
     'debian+binary': {
         "cloudkitty-base",
         "ironic-neutron-agent",
+        "masakari-base",
         "nova-serialproxy",
         "senlin-conductor",  # no binary package
         "senlin-health-manager",  # no binary package
diff --git a/releasenotes/notes/masakari-ubuntu-binary-e3bb7a82c73e48e7.yaml b/releasenotes/notes/masakari-ubuntu-binary-e3bb7a82c73e48e7.yaml
new file mode 100644
index 000000000..bb13929d9
--- /dev/null
+++ b/releasenotes/notes/masakari-ubuntu-binary-e3bb7a82c73e48e7.yaml
@@ -0,0 +1,4 @@
+---
+features:
+  - |
+    Support for Ubuntu binary (aka packaged) Masakari images.