aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-03-19 20:06:03 +0000
committerGerrit Code Review <review@openstack.org>2015-03-19 20:06:03 +0000
commit415c5e47476786ed0808264fb4d65c82bc9d40b9 (patch)
treed45e0cc1e34df64316edd9adb383b2b37379a09c
parentf91293cd5d7b7816be735edddc8736588af8ed23 (diff)
parent858cdda3ec89b17544ee1a205f8c8ed107ce32e2 (diff)
downloadkolla-415c5e47476786ed0808264fb4d65c82bc9d40b9.tar.gz
kolla-415c5e47476786ed0808264fb4d65c82bc9d40b9.zip
Merge "Use keystone authentication with Glance"
-rw-r--r--docker/glance/glance-base/config-glance.sh5
1 files changed, 5 insertions, 0 deletions
diff --git a/docker/glance/glance-base/config-glance.sh b/docker/glance/glance-base/config-glance.sh
index a6380e5c8..137815e70 100644
--- a/docker/glance/glance-base/config-glance.sh
+++ b/docker/glance/glance-base/config-glance.sh
@@ -51,6 +51,11 @@ for cfg in /etc/glance/glance-api.conf /etc/glance/glance-registry.conf; do
"${GLANCE_KEYSTONE_PASSWORD}"
crudini --set $cfg \
+ paste_deploy \
+ flavor \
+ keystone
+
+ crudini --set $cfg \
database \
connection \
"mysql://${GLANCE_DB_USER}:${GLANCE_DB_PASSWORD}@${MARIADB_SERVICE_HOST}/${GLANCE_DB_NAME}"