diff options
| author | Lars Kellogg-Stedman <lars@redhat.com> | 2014-10-05 16:12:44 -0400 |
|---|---|---|
| committer | Lars Kellogg-Stedman <lars@redhat.com> | 2014-10-07 10:58:52 -0400 |
| commit | 068face6fa52d19d421913b9969b291500a39c6d (patch) | |
| tree | 4eb637bcdc592bc66ff13c47745184aafb100f25 /docker/keystone | |
| parent | 296b09e0c444cc91f3e9f4a1046989d956c1253a (diff) | |
| download | kolla-068face6fa52d19d421913b9969b291500a39c6d.tar.gz kolla-068face6fa52d19d421913b9969b291500a39c6d.zip | |
use renamed mariadb services
This patch updates all the json files that reference the mariadb service
variables to ues the new names.
Labelling things foo-master crept into this repository from the
kubernetes guestbook example (which has redis-master and redis-slaves).
We're not running clustered software at the moment so these labels are
unnecessary.
Change-Id: I229d04c89aa13cb6cc2e1c33a0a7b21e1c6e9caa
Diffstat (limited to 'docker/keystone')
| -rwxr-xr-x | docker/keystone/start.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docker/keystone/start.sh b/docker/keystone/start.sh index 6e0ff7cd7..a825c39d8 100755 --- a/docker/keystone/start.sh +++ b/docker/keystone/start.sh @@ -1,7 +1,7 @@ #!/bin/bash # Exit the container if MariaDB is not yet up - then depend on kube to restart -if [ -z "$MARIADBMASTER_PORT_3306_TCP_PORT" ]; then +if [ -z "$MARIADB_PORT_3306_TCP_PORT" ]; then exit 1 fi @@ -16,7 +16,7 @@ if ! [ "$KEYSTONE_DB_PASSWORD" ]; then KEYSTONE_DB_PASSWORD=$(openssl rand -hex 15) fi -mysql -h ${MARIADBMASTER_PORT_3306_TCP_ADDR} -u root -p${DB_ROOT_PASSWORD} mysql <<EOF +mysql -h ${MARIADB_PORT_3306_TCP_ADDR} -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}' @@ -25,7 +25,7 @@ EOF crudini --set /etc/keystone/keystone.conf \ database \ connection \ - "mysql://keystone:${KEYSTONE_DB_PASSWORD}@${MARIADBMASTER_PORT_3306_TCP_ADDR}:${MARIADBMASTER_PORT_3306_TCP_PORT}/keystone" + "mysql://keystone:${KEYSTONE_DB_PASSWORD}@${MARIADB_PORT_3306_TCP_ADDR}:${MARIADB_PORT_3306_TCP_PORT}/keystone" crudini --set /etc/keystone/keystone.conf \ DEFAULT \ admin_token \ |