diff options
| author | SamYaple <sam@yaple.net> | 2016-03-19 13:58:19 +0000 |
|---|---|---|
| committer | Sam Yaple <sam@yaple.net> | 2016-03-21 12:23:00 +0000 |
| commit | afce10dea418dcf691e8f4539f5fb7dc766235a3 (patch) | |
| tree | 992267417b513d2940d9b4b9a404dcf4c1c15410 /docker | |
| parent | 05b6995f6340099bc531561f61fb85a1795f5f0d (diff) | |
| download | kolla-afce10dea418dcf691e8f4539f5fb7dc766235a3.tar.gz kolla-afce10dea418dcf691e8f4539f5fb7dc766235a3.zip | |
Fix mysql bootstrap
The lightsout recover patch broke multinode mysql. Also the lightsout
recovery didnt probably pass the --wsrep-new-cluster flag. This
updates the mariadb bootstrap to work with multinode again.
Closes-Bug: #1559480
Related-Id: I903c3bcd069af39814bcabcef37684b1f043391f
Change-Id: I1ec91a8b2144930ea8f04cc1c201b53712352e4e
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 |