diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-10-13 20:31:23 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-10-13 20:31:23 +0000 |
| commit | a07d6603ac75ef8aea591884b9c683e4be1a1279 (patch) | |
| tree | 1be0d2af888bccc47e263e0d49aef3c37892e34d | |
| parent | dfed1d205fb28312a89ad1c93604f4537120ba76 (diff) | |
| parent | f2a747b353b01431e12e5b298f0ed0ea48485cba (diff) | |
| download | kolla-a07d6603ac75ef8aea591884b9c683e4be1a1279.tar.gz kolla-a07d6603ac75ef8aea591884b9c683e4be1a1279.zip | |
Merge "properly quote password in keystone start script"
| -rwxr-xr-x | docker/keystone/start.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/keystone/start.sh b/docker/keystone/start.sh index 412f1c9ce..7b0897eb0 100755 --- a/docker/keystone/start.sh +++ b/docker/keystone/start.sh @@ -16,7 +16,7 @@ if ! [ "$KEYSTONE_DB_PASSWORD" ]; then KEYSTONE_DB_PASSWORD=$(openssl rand -hex 15) fi -mysql -h ${MARIADB_PORT_3306_TCP_ADDR} -u root -p${DB_ROOT_PASSWORD} mysql <<EOF +mysql -h ${MARIADB_SERVICE_HOST} -u root -p"${DB_ROOT_PASSWORD}" mysql <<EOF CREATE DATABASE IF NOT EXISTS keystone; GRANT ALL PRIVILEGES ON keystone.* TO 'keystone'@'%' IDENTIFIED BY '${KEYSTONE_DB_PASSWORD}' |