diff options
| author | Zuul <zuul@review.opendev.org> | 2023-05-17 17:09:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2023-05-17 17:09:53 +0000 |
| commit | ea951969550bfbcb3e42673a7f68f8556fd15409 (patch) | |
| tree | deafaadc2c445b6312af0602e0d261aa602f36d4 /docker | |
| parent | d965b1b3da9b8c2780a91781834a46f5886bd9c2 (diff) | |
| parent | 1cae428f958cf2d2dd967961318d5e4b56d836af (diff) | |
| download | kolla-ea951969550bfbcb3e42673a7f68f8556fd15409.tar.gz kolla-ea951969550bfbcb3e42673a7f68f8556fd15409.zip | |
Merge "mariadb: log bootstrap output to file"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/mariadb/mariadb-server/extend_start.sh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/docker/mariadb/mariadb-server/extend_start.sh b/docker/mariadb/mariadb-server/extend_start.sh index 72f60c857..87d6af2a0 100644 --- a/docker/mariadb/mariadb-server/extend_start.sh +++ b/docker/mariadb/mariadb-server/extend_start.sh @@ -20,9 +20,12 @@ function bootstrap_db { done sudo -E kolla_security_reset + + set +o xtrace mysql -u root --password="${DB_ROOT_PASSWORD}" -e "GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' IDENTIFIED BY '${DB_ROOT_PASSWORD}' WITH GRANT OPTION;" mysql -u root --password="${DB_ROOT_PASSWORD}" -e "GRANT ALL PRIVILEGES ON *.* TO 'root'@'%' IDENTIFIED BY '${DB_ROOT_PASSWORD}' WITH GRANT OPTION;" mysqladmin -uroot -p"${DB_ROOT_PASSWORD}" shutdown + set -o xtrace } # Create log directory, with appropriate permissions @@ -35,8 +38,8 @@ fi # This catches all cases of the BOOTSTRAP variable being set, including empty if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then - mysql_install_db - bootstrap_db + mysql_install_db 2>&1 | tee -a ${MARIADB_LOG_DIR}/mariadb-bootstrap.log + bootstrap_db 2>&1 | tee -a ${MARIADB_LOG_DIR}/mariadb-bootstrap.log exit 0 fi |