diff options
| author | Zuul <zuul@review.opendev.org> | 2019-08-12 19:38:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-08-12 19:38:07 +0000 |
| commit | 65c0e2acb9d8e968178339bfbd517c9a849fc27a (patch) | |
| tree | 64c5b8f9c80006460d934771298de5c0ba531550 /docker | |
| parent | 38f8e6776996111e2eb60bd366abb3741a79379a (diff) | |
| parent | 99de712a2dd49593daba09accac7811bc51b56ad (diff) | |
| download | kolla-65c0e2acb9d8e968178339bfbd517c9a849fc27a.tar.gz kolla-65c0e2acb9d8e968178339bfbd517c9a849fc27a.zip | |
Merge "Support customising MariaDB log directory"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/mariadb/extend_start.sh | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/docker/mariadb/extend_start.sh b/docker/mariadb/extend_start.sh index c07c00a9e..72f60c857 100644 --- a/docker/mariadb/extend_start.sh +++ b/docker/mariadb/extend_start.sh @@ -1,5 +1,7 @@ #!/bin/bash +: ${MARIADB_LOG_DIR:=/var/log/kolla/mariadb} + function bootstrap_db { mysqld_safe --wsrep-new-cluster --skip-networking --wsrep-on=OFF --pid-file=/var/lib/mysql/mariadb.pid & # Wait for the mariadb server to be "Ready" before starting the security reset with a max timeout @@ -24,11 +26,11 @@ function bootstrap_db { } # Create log directory, with appropriate permissions -if [[ ! -d "/var/log/kolla/mariadb" ]]; then - mkdir -p /var/log/kolla/mariadb +if [[ ! -d "${MARIADB_LOG_DIR}" ]]; then + mkdir -p ${MARIADB_LOG_DIR} fi -if [[ $(stat -c %a /var/log/kolla/mariadb) != "755" ]]; then - chmod 755 /var/log/kolla/mariadb +if [[ $(stat -c %a ${MARIADB_LOG_DIR}) != "755" ]]; then + chmod 755 ${MARIADB_LOG_DIR} fi # This catches all cases of the BOOTSTRAP variable being set, including empty |