diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-21 13:02:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-21 13:02:40 +0000 |
| commit | b333f44a534374ac59a0e78960fc40f6cf6a6715 (patch) | |
| tree | 54e7b17ecdfa08e53c036c22c6857876934cc84a /docker | |
| parent | 2fc2dc6457294529d7b4ad5892bf9557f799f74f (diff) | |
| parent | afce10dea418dcf691e8f4539f5fb7dc766235a3 (diff) | |
| download | kolla-b333f44a534374ac59a0e78960fc40f6cf6a6715.tar.gz kolla-b333f44a534374ac59a0e78960fc40f6cf6a6715.zip | |
Merge "Fix mysql bootstrap"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/mariadb/extend_start.sh | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/docker/mariadb/extend_start.sh b/docker/mariadb/extend_start.sh index 3d826c4e8..e5d9632b9 100644 --- a/docker/mariadb/extend_start.sh +++ b/docker/mariadb/extend_start.sh @@ -32,8 +32,12 @@ if [[ $(stat -c %a /var/log/kolla/mariadb) != "755" ]]; then fi # This catches all cases of the BOOTSTRAP variable being set, including empty -if [[ "${!KOLLA_BOOTSTRAP[@]}" ]] && [[ ! -e /var/lib/mysql/cluster.exists ]]; then +if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then mysql_install_db bootstrap_db - touch /var/lib/mysql/cluster.exists + exit 0 +fi + +if [[ "${!BOOTSTRAP_ARGS[@]}" ]]; then + ARGS="${BOOTSTRAP_ARGS}" fi |