diff options
| author | Mark Goddard <mark@stackhpc.com> | 2023-05-24 15:19:16 +0100 |
|---|---|---|
| committer | Michal Nasiadka <mnasiadka@gmail.com> | 2023-05-30 15:50:01 +0000 |
| commit | 9035251443ed6cbb110e9dc5efdbc9d4be797ef5 (patch) | |
| tree | 5d2a0e40f548d61614e58dc9c487c5dc2d152688 | |
| parent | 600ed4f149a1cf542f54d7fc5005030f53c69a83 (diff) | |
| download | kolla-9035251443ed6cbb110e9dc5efdbc9d4be797ef5.tar.gz kolla-9035251443ed6cbb110e9dc5efdbc9d4be797ef5.zip | |
mariadb-clustercheck: ensure /var/log/kolla/mariadb exists
If mariadb-clustercheck starts before mariadb, the directory may not
exist, and the command fails.
This is necessary for the refactored MariaDB restart in
I5a12670d07077d24047aaff57ce8d33ccf7156ff.
Change-Id: Ie1b36eb9a403611c2f86aa4c1d500d324e5291f3
| -rw-r--r-- | docker/mariadb/mariadb-clustercheck/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | docker/mariadb/mariadb-clustercheck/extend_start.sh | 11 |
2 files changed, 15 insertions, 0 deletions
diff --git a/docker/mariadb/mariadb-clustercheck/Dockerfile.j2 b/docker/mariadb/mariadb-clustercheck/Dockerfile.j2 index d112bdc4c..1aa8aa13a 100644 --- a/docker/mariadb/mariadb-clustercheck/Dockerfile.j2 +++ b/docker/mariadb/mariadb-clustercheck/Dockerfile.j2 @@ -5,5 +5,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% block mariadb_clustercheck_header %}{% endblock %} +COPY extend_start.sh /usr/local/bin/kolla_extend_start + +RUN chmod 644 /usr/local/bin/kolla_extend_start + {% block mariadb_clustercheck_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/mariadb/mariadb-clustercheck/extend_start.sh b/docker/mariadb/mariadb-clustercheck/extend_start.sh new file mode 100644 index 000000000..7379abddc --- /dev/null +++ b/docker/mariadb/mariadb-clustercheck/extend_start.sh @@ -0,0 +1,11 @@ +#!/bin/bash + +: ${MARIADB_LOG_DIR:=/var/log/kolla/mariadb} + +# Create log directory, with appropriate permissions +if [[ ! -d "${MARIADB_LOG_DIR}" ]]; then + mkdir -p ${MARIADB_LOG_DIR} +fi +if [[ $(stat -c %a ${MARIADB_LOG_DIR}) != "755" ]]; then + chmod 755 ${MARIADB_LOG_DIR} +fi |