diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-09-21 03:05:37 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-09-21 03:05:37 +0000 |
| commit | 1512d3736c1f34e38b1af3f0817b429f1755e0ae (patch) | |
| tree | 7921f4ce7a4ac3dabb225ddede05e76fdb58b116 /docker/services | |
| parent | 2ddbb7dbf88afe172ea3ad76d21ae4c29be4c004 (diff) | |
| parent | ae4525574181865127ce2f2086b7729748b0f2fc (diff) | |
Merge "Disable all uses of wsrep-provider in mysql_bootstrap container" into stable/pike
Diffstat (limited to 'docker/services')
| -rw-r--r-- | docker/services/pacemaker/database/mysql.yaml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/docker/services/pacemaker/database/mysql.yaml b/docker/services/pacemaker/database/mysql.yaml index 4d5a0a15..9dace271 100644 --- a/docker/services/pacemaker/database/mysql.yaml +++ b/docker/services/pacemaker/database/mysql.yaml @@ -159,6 +159,7 @@ outputs: detach: false image: {get_param: DockerMysqlImage} net: host + user: root # Kolla bootstraps aren't idempotent, explicitly checking if bootstrap was done command: - 'bash' @@ -167,8 +168,9 @@ outputs: list_join: - "\n" - - 'if [ -e /var/lib/mysql/mysql ]; then exit 0; fi' - - 'kolla_start' - - 'mysqld_safe --skip-networking --wsrep-on=OFF --wsrep-provider=none &' + - 'echo -e "\n[mysqld]\nwsrep_provider=none" >> /etc/my.cnf' + - 'sudo -u mysql -E kolla_start' + - 'mysqld_safe --skip-networking --wsrep-on=OFF &' - '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;"' |