diff options
| author | Zuul <zuul@review.opendev.org> | 2025-10-06 09:46:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2025-10-06 09:46:45 +0000 |
| commit | 1dabf1812a59aa4e7313502bbd44dba5d74223a4 (patch) | |
| tree | 6d071baf9a72dad22ec7bf6c7c7b570d1d4d1626 | |
| parent | 6c8f2b9042aeb6be020f1c74a73b8dc3ff65de8f (diff) | |
| parent | 683ae79657532243a31ead1b35e82877f1778991 (diff) | |
| download | kolla-1dabf1812a59aa4e7313502bbd44dba5d74223a4.tar.gz kolla-1dabf1812a59aa4e7313502bbd44dba5d74223a4.zip | |
Merge "Add MariaDB healthcheck.sh"
| -rw-r--r-- | docker/mariadb/mariadb-base/Dockerfile.j2 | 6 | ||||
| -rw-r--r-- | kolla/common/sources.py | 5 | ||||
| -rw-r--r-- | releasenotes/notes/add-mariadb-healthcheck-script-916e5ad7a216e05e.yaml | 8 |
3 files changed, 19 insertions, 0 deletions
diff --git a/docker/mariadb/mariadb-base/Dockerfile.j2 b/docker/mariadb/mariadb-base/Dockerfile.j2 index ddf6d50d9..51cdadb29 100644 --- a/docker/mariadb/mariadb-base/Dockerfile.j2 +++ b/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 %} diff --git a/kolla/common/sources.py b/kolla/common/sources.py index 3c9ceb0fc..ea8df7c57 100644 --- a/kolla/common/sources.py +++ b/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/' diff --git a/releasenotes/notes/add-mariadb-healthcheck-script-916e5ad7a216e05e.yaml b/releasenotes/notes/add-mariadb-healthcheck-script-916e5ad7a216e05e.yaml new file mode 100644 index 000000000..16be532eb --- /dev/null +++ b/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. |