diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-01-29 17:41:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-01-29 17:41:14 +0000 |
| commit | 0f635266fea764bc13f685716cca3d9f9d68bdec (patch) | |
| tree | 6ccaf8c7abf6b78a1391d0581725e9fa615a3a4b /docker | |
| parent | 473022a7326f1dd94ec56012c714982e22e2286b (diff) | |
| parent | 7e2ce014316677af9b83c42745afe9e42f0c8709 (diff) | |
| download | kolla-0f635266fea764bc13f685716cca3d9f9d68bdec.tar.gz kolla-0f635266fea764bc13f685716cca3d9f9d68bdec.zip | |
Merge "Cleanup mariadb and make compatiable with mesos"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/mariadb/extend_start.sh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/docker/mariadb/extend_start.sh b/docker/mariadb/extend_start.sh index dcbdac2ed..55e9ae4c9 100644 --- a/docker/mariadb/extend_start.sh +++ b/docker/mariadb/extend_start.sh @@ -4,7 +4,7 @@ function bootstrap_db { mysqld_safe --wsrep-new-cluster & # Wait for the mariadb server to be "Ready" before starting the security reset with a max timeout TIMEOUT=${DB_MAX_TIMEOUT:-60} - while [ ! -f ${DB_PID_FILE} ]; do + while [[ ! -f /var/lib/mysql/mariadb.pid ]]; do if [[ ${TIMEOUT} -gt 0 ]]; then let TIMEOUT-=1 sleep 1 @@ -18,7 +18,10 @@ function bootstrap_db { mysqladmin -uroot -p"${DB_ROOT_PASSWORD}" shutdown } -sudo chown mysql: /var/lib/mysql +# Only update permissions if permissions need to be updated +if [[ $(stat -c %U:%G /var/lib/mysql) != "mysql:mysql" ]]; then + sudo chown mysql: /var/lib/mysql +fi # This catches all cases of the BOOTSTRAP variable being set, including empty if [[ "${!KOLLA_BOOTSTRAP[@]}" ]] && [[ ! -e /var/lib/mysql/cluster.exists ]]; then |