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/glance | |
| 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/glance')
| -rw-r--r-- | docker/glance/glance-base/config-glance.sh | 2 | ||||
| -rwxr-xr-x | docker/glance/glance-registry/start.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docker/glance/glance-base/config-glance.sh b/docker/glance/glance-base/config-glance.sh index 2b2ae0473..6cdd76efd 100644 --- a/docker/glance/glance-base/config-glance.sh +++ b/docker/glance/glance-base/config-glance.sh @@ -50,5 +50,5 @@ crudini --set $cfg crudini --set $cfg \ database \ connection \ - "mysql://${GLANCE_DB_USER}:${GLANCE_DB_PASSWORD}@${MARIADBMASTER_PORT_3306_TCP_ADDR}:${MARIADBMASTER_PORT_3306_TCP_PORT}/${GLANCE_DB_NAME}" + "mysql://${GLANCE_DB_USER}:${GLANCE_DB_PASSWORD}@${MARIADB_PORT_3306_TCP_ADDR}:${MARIADB_PORT_3306_TCP_PORT}/${GLANCE_DB_NAME}" diff --git a/docker/glance/glance-registry/start.sh b/docker/glance/glance-registry/start.sh index 4918e2454..c169087a9 100755 --- a/docker/glance/glance-registry/start.sh +++ b/docker/glance/glance-registry/start.sh @@ -23,7 +23,7 @@ fi sh /opt/glance/config-glance.sh registry -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 ${GLANCE_DB_NAME} DEFAULT CHARACTER SET utf8; GRANT ALL PRIVILEGES ON ${GLANCE_DB_NAME}.* TO '${GLANCE_DB_USER}'@'%' IDENTIFIED BY '${GLANCE_DB_PASSWORD}' |