diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-31 21:08:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-31 21:08:31 +0000 |
| commit | 5771454dde4f898d6a6cb00e430425203ec4accf (patch) | |
| tree | 9d345ac8d1665818e3166e9b821e02c702b9c97e /docker | |
| parent | f8c2f03094305216e5c9428cebd555fac1103f3e (diff) | |
| parent | 3f1a3c386a6ad10fb1965583159f1a15f19200e4 (diff) | |
| download | kolla-5771454dde4f898d6a6cb00e430425203ec4accf.tar.gz kolla-5771454dde4f898d6a6cb00e430425203ec4accf.zip | |
Merge "Fix mysql permissions"
Diffstat (limited to 'docker')
| -rwxr-xr-x | docker/galera/config-galera.sh | 3 | ||||
| -rwxr-xr-x | docker/galera/start.sh | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/docker/galera/config-galera.sh b/docker/galera/config-galera.sh index e66084001..cfdd7d9a2 100755 --- a/docker/galera/config-galera.sh +++ b/docker/galera/config-galera.sh @@ -32,6 +32,5 @@ function bootstrap_db { } function populate_db { - mysql_install_db - chown -R mysql: /var/lib/mysql + mysql_install_db --user=mysql } diff --git a/docker/galera/start.sh b/docker/galera/start.sh index f8f8d7f77..986cca733 100755 --- a/docker/galera/start.sh +++ b/docker/galera/start.sh @@ -14,6 +14,8 @@ set_configs # loading functions source /opt/kolla/config/config-galera.sh +chown mysql: /var/lib/mysql + # This catches all cases of the BOOTSTRAP variable being set, including empty if [[ "${!KOLLA_BOOTSTRAP[@]}" ]] && [[ ! -e /var/lib/mysql/cluster.exists ]]; then ARGS="--wsrep-new-cluster" |