Add Masakari containers

Masakari provides Instances High Availability Service for
OpenStack clouds by automatically recovering failed Instances.

Change-Id: I279d6b43f8e4d4e30b39deb607823ceca272a4b8
Implements: blueprint masakari-support

README.rst

@@ -94,6 +94,7 @@ Kolla provides images to deploy the following OpenStack projects:
 - `Kuryr <https://docs.openstack.org/kuryr/latest/>`__
 - `Magnum <https://docs.openstack.org/magnum/latest/>`__
 - `Manila <https://docs.openstack.org/manila/latest/>`__
+- `Masakari <https://docs.openstack.org/masakari/latest/>`__
 - `Mistral <https://docs.openstack.org/mistral/latest/>`__
 - `Monasca <https://docs.openstack.org/monasca-api/latest/>`__
 - `Murano <https://docs.openstack.org/murano/latest/>`__

docker/horizon/extend_start.sh

@@ -157,6 +157,20 @@ function config_manila_ui {
     done
 }
 
+function config_masakari_dashboard {
+    for file in ${SITE_PACKAGES}/masakaridashboard/local/enabled/_*[^__].py; do
+        config_dashboard "${ENABLE_MASAKARI}" \
+            "${SITE_PACKAGES}/masakaridashboard/local/enabled/${file##*/}" \
+            "${SITE_PACKAGES}/openstack_dashboard/local/enabled/${file##*/}"
+    done
+    config_dashboard "${ENABLE_MASAKARI}"\
+        "${SITE_PACKAGES}/masakaridashboard/conf/masakari_policy.json" \
+        "${SITE_PACKAGES}/openstack_dashboard/conf/masakari_policy.json"
+    config_dashboard "${ENABLE_MASAKARI}"\
+        "${SITE_PACKAGES}/masakaridashboard/local/local_settings.d/_50_masakari.py" \
+        "${SITE_PACKAGES}/openstack_dashboard/local/local_settings.d/_50_masakari.py"
+}
+
 function config_murano_dashboard {
     for file in ${SITE_PACKAGES}/muranodashboard/local/enabled/_*[^__].py; do
         config_dashboard "${ENABLE_MURANO}" \
@@ -325,6 +339,7 @@ config_ironic_dashboard
 config_karbor_dashboard
 config_magnum_dashboard
 config_manila_ui
+config_masakari_dashboard
 config_mistral_dashboard
 config_murano_dashboard
 config_neutron_vpnaas_dashboard

docker/masakari/masakari-api/Dockerfile.j2

@@ -0,0 +1,17 @@
+FROM {{ namespace }}/{{ image_prefix }}masakari-base:{{ tag }}
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
+
+{% block masakari_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_masakari_extend_start
+RUN chmod 755 /usr/local/bin/kolla_masakari_extend_start
+
+{% block masakari_api_footer %}{% endblock %}
+{% block footer %}{% endblock %}

docker/masakari/masakari-api/extend_start.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+# NOTE(pbourke): httpd will not clean up after itself in some cases which
+# results in the container not being able to restart. (bug #1489676, 1557036)
+if [[ "${KOLLA_BASE_DISTRO}" =~ debian|ubuntu ]]; then
+    # Loading Apache2 ENV variables
+    . /etc/apache2/envvars
+    install -d /var/run/apache2/
+    rm -rf /var/run/apache2/*
+else
+    rm -rf /var/run/httpd/* /run/httpd/* /tmp/httpd*
+fi
+
+# Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases
+# of the KOLLA_BOOTSTRAP variable being set, including empty.
+if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
+    masakari-manage db sync
+    exit 0
+fi

docker/masakari/masakari-base/Dockerfile.j2

@@ -0,0 +1,72 @@
+FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
+
+{% block masakari_base_header %}{% endblock %}
+
+{% import "macros.j2" as macros with context %}
+
+{{ macros.configure_user(name='masakari') }}
+
+{% 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 masakari_base_packages = [
+            'httpd',
+            'mod_ssl',
+        ] %}
+        {% if distro_python_version.startswith('3') %}
+        {% set masakari_base_packages = masakari_base_packages + [
+            'python3-ldappool',
+            'python3-mod_wsgi'
+        ] %}
+        {% else %}
+        {% set masakari_base_packages = masakari_base_packages + [
+            'mod_wsgi',
+            'python2-ldappool'
+        ] %}
+        {% endif %}
+
+{{ macros.install_packages(masakari_base_packages | customizable("packages")) }}
+RUN mkdir -p /var/www/cgi-bin/masakari \
+    && 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' %}
+
+        {% set masakari_base_packages = [
+            'apache2',
+            'libapache2-mod-wsgi-py3',
+            'python3-ldappool'
+        ] %}
+
+{{ macros.install_packages(masakari_base_packages | customizable("packages")) }}
+RUN mkdir -p /var/www/cgi-bin/masakari \
+    && echo > /etc/apache2/ports.conf
+    {% endif %}
+
+ADD masakari-base-archive /masakari-base-source
+
+{% set masakari_base_pip_packages = [
+    '/masakari'
+] %}
+
+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 \
+    && chown -R masakari: /etc/masakari /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
+
+{% block masakari_base_footer %}{% endblock %}

docker/masakari/masakari-base/extend_start.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+if [[ ! -d "/var/log/kolla/masakari" ]]; then
+    mkdir -p /var/log/kolla/masakari
+fi
+if [[ $(stat -c %a /var/log/kolla/masakari) != "755" ]]; then
+    chmod 755 /var/log/kolla/masakari
+fi
+
+. /usr/local/bin/kolla_masakari_extend_start

docker/masakari/masakari-engine/Dockerfile.j2

@@ -0,0 +1,16 @@
+FROM {{ namespace }}/{{ image_prefix }}masakari-base:{{ tag }}
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
+
+{% block masakari_engine_header %}{% endblock %}
+
+{% if install_type == 'binary' %}
+
+RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
+    && /bin/false
+
+{% endif %}
+
+{% block masakari_engine_footer %}{% endblock %}
+{% block footer %}{% endblock %}
+
+USER masakari

docker/masakari/masakari-monitors/Dockerfile.j2

@@ -0,0 +1,58 @@
+FROM {{ namespace }}/{{ image_prefix }}masakari-base:{{ tag }}
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
+
+{% block masakari_monitors_header %}{% endblock %}
+
+{% import "macros.j2" as macros with context %}
+
+{{ macros.configure_user(name='masakari') }}
+
+{% if install_type == 'binary' %}
+
+RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
+    && /bin/false
+
+{% elif install_type == 'source' %}
+
+    {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
+
+        {% set masakari_monitors_packages = [
+            'libvirt-devel',
+            'pacemaker-cli',
+            'tcpdump',
+        ] %}
+
+    {% elif base_distro in ['debian', 'ubuntu'] %}
+
+        {% set masakari_monitors_packages = [
+            'libvirt-dev',
+            'pacemaker-cli-utils',
+            'tcpdump',
+        ] %}
+
+    {% endif %}
+
+{{ macros.install_packages(masakari_monitors_packages | customizable("packages")) }}
+
+ADD masakari-monitors-archive /masakari-monitors-source
+
+{% set masakari_monitors_pip_packages = [
+    '/masakari-monitors'
+] %}
+
+RUN ln -s masakari-monitors-source/* masakari-monitors \
+    && {{ macros.install_pip(masakari_monitors_pip_packages | customizable("pip_packages")) }} \
+    && mkdir -p /etc/masakari-monitors \
+    && chown -R masakari: /etc/masakari-monitors
+
+COPY masakari_monitors_sudoers /etc/sudoers.d/kolla_masakari_monitors_sudoers
+
+RUN chmod 750 /etc/sudoers.d \
+    && chmod 640 /etc/sudoers.d/kolla_masakari_monitors_sudoers
+
+{% endif %}
+
+{% block masakari_monitors_footer %}{% endblock %}
+{% block footer %}{% endblock %}
+
+USER masakari

docker/masakari/masakari-monitors/masakari_monitors_sudoers

@@ -0,0 +1,2 @@
+masakari ALL=(root) NOPASSWD: /var/lib/kolla/venv/bin/privsep-helper
+masakari ALL=(root) NOPASSWD: /usr/sbin/tcpdump *

kolla/common/config.py

@@ -109,6 +109,7 @@ _PROFILE_OPTS = [
                     'kuryr',
                     'magnum',
                     'manila',
+                    'masakari',
                     'mistral',
                     'monasca',
                     'murano',
@@ -423,6 +424,10 @@ SOURCES = {
         'type': 'url',
         'location': ('$tarballs_base/manila-ui/'
                      'manila-ui-master.tar.gz')},
+    'horizon-plugin-masakari-dashboard': {
+        'type': 'url',
+        'location': ('$tarballs_base/masakari-dashboard/'
+                     'masakari-dashboard-master.tar.gz')},
     'horizon-plugin-mistral-dashboard': {
         'type': 'url',
         'location': ('$tarballs_base/mistral-dashboard/'
@@ -519,6 +524,14 @@ SOURCES = {
         'type': 'url',
         'location': ('$tarballs_base/manila/'
                      'manila-master.tar.gz')},
+    'masakari-base': {
+        'type': 'url',
+        'location': ('$tarballs_base/masakari/'
+                     'masakari-master.tar.gz')},
+    'masakari-monitors': {
+        'type': 'url',
+        'location': ('$tarballs_base/masakari-monitors/'
+                     'masakari-monitors-master.tar.gz')},
     'mistral-base': {
         'type': 'url',
         'location': ('$tarballs_base/mistral/'
@@ -1177,6 +1190,10 @@ USERS = {
     'qinling-user': {
         'uid': 42484,
         'gid': 42484,
+    },
+    'masakari-user': {
+        'uid': 42485,
+        'gid': 42485,
     }
 }
 

kolla/image/build.py

@@ -102,6 +102,7 @@ SKIPPED_IMAGES = {
         "freezer-base",
         "karbor-base",
         "kuryr-base",
+        "masakari-base",
         "monasca-base",
         "monasca-thresh",
         "nova-mksproxy",

releasenotes/notes/masakari-a047b0387a474186.yaml

@@ -0,0 +1,5 @@
+---
+features:
+   - Add Masakari images. Masakari provides Instances
+     High Availability Service for OpenStack clouds by
+     automatically recovering failed Instances.