summaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-09-01 07:55:36 +0000
committerGerrit Code Review <review@openstack.org>2017-09-01 07:55:36 +0000
commitb18c773dd7c1f2b945587f64d5e97c35ba898399 (patch)
treed553c9fb9bcb28d70cbe0654b47ded8d6d1848de /docker
parent33a93bbf0999feafcce4046eb90bdd1917c5e4ea (diff)
parent5c870afe4543f1ae7bd7e11bd4d16b39b37b54a1 (diff)
Merge "Add --wsrep-provider=none to the mysql_bootstrap container" into stable/pike
Diffstat (limited to 'docker')
-rw-r--r--docker/services/pacemaker/database/mysql.yaml4
1 files changed, 2 insertions, 2 deletions
diff --git a/docker/services/pacemaker/database/mysql.yaml b/docker/services/pacemaker/database/mysql.yaml
index 3de1696d..f57f779e 100644
--- a/docker/services/pacemaker/database/mysql.yaml
+++ b/docker/services/pacemaker/database/mysql.yaml
@@ -162,13 +162,13 @@ outputs:
# Kolla bootstraps aren't idempotent, explicitly checking if bootstrap was done
command:
- 'bash'
- - '-ec'
+ - '-ecx'
-
list_join:
- "\n"
- - 'if [ -e /var/lib/mysql/mysql ]; then exit 0; fi'
- 'kolla_start'
- - 'mysqld_safe --skip-networking --wsrep-on=OFF &'
+ - 'mysqld_safe --skip-networking --wsrep-on=OFF --wsrep-provider=none &'
- 'timeout ${DB_MAX_TIMEOUT} /bin/bash -c ''until mysqladmin -uroot -p"${DB_ROOT_PASSWORD}" ping 2>/dev/null; do sleep 1; done'''
- 'mysql -uroot -p"${DB_ROOT_PASSWORD}" -e "CREATE USER ''clustercheck''@''localhost'' IDENTIFIED BY ''${DB_CLUSTERCHECK_PASSWORD}'';"'
- 'mysql -uroot -p"${DB_ROOT_PASSWORD}" -e "GRANT PROCESS ON *.* TO ''clustercheck''@''localhost'' WITH GRANT OPTION;"'