Merge "Add MariaDB healthcheck.sh"

docker/mariadb/mariadb-base/Dockerfile.j2

@@ -33,6 +33,12 @@ ARG mariadb_clustercheck_url=https://src.fedoraproject.org/rpms/mariadb/raw/${ma
 RUN curl -o /usr/bin/clustercheck ${mariadb_clustercheck_url} \
     && chmod 755 /usr/bin/clustercheck
 
+{% block mariadb_healthcheck %}
+ENV MARIADB_VERSION=10.11
+ADD plugins-archive /
+RUN install -m 755 /plugins/mariadb-base-plugin-mariadb-docker-archive*/$MARIADB_VERSION/healthcheck.sh /usr/bin/healthcheck.sh
+{% endblock %}
+
 {{ macros.kolla_patch_sources() }}
 
 {% block mariadb_base_footer %}{% endblock %}

kolla/common/sources.py

@@ -193,6 +193,11 @@ SOURCES = {
         'type': 'url',
         'location': ('$tarballs_base/openstack/manila/'
                      'manila-${openstack_branch}.tar.gz')},
+    'mariadb-base-plugin-mariadb-docker': {
+        # NOTE(seunghun1ee): This repo is needed to get MariaDB healthcheck.sh
+        'type': 'git',
+        'reference': 'master',
+        'location': ('https://github.com/MariaDB/mariadb-docker')},
     'masakari-base': {
         'type': 'url',
         'location': ('$tarballs_base/openstack/masakari/'

releasenotes/notes/add-mariadb-healthcheck-script-916e5ad7a216e05e.yaml

@@ -0,0 +1,8 @@
+---
+features:
+  - |
+    Added new MariaDB container health check script ``healthcheck.sh``.
+    This script is from official docker images of MariaDB.
+
+    This script is planned to replace current health check script
+    ``clustercheck.sh`` to keep compatibility with newer MariaDB releases.