summaryrefslogtreecommitdiff
path: root/openstack/etc/glance/glance-api.conf
diff options
context:
space:
mode:
authorFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2015-01-14 15:06:58 +0000
committerFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2015-01-22 12:46:30 +0000
commit52d479690a1ec8a546ccc64fcef48ad9938f61f0 (patch)
treebe6f8152940ed7565f0a923282d64c7deafdc7d1 /openstack/etc/glance/glance-api.conf
parent4bfee8b106cfb0d8151c3322227b36282a0dbf30 (diff)
downloaddefinitions-52d479690a1ec8a546ccc64fcef48ad9938f61f0.tar.gz
FIXUPME: Replace authentication parameters in glance and neutron
Diffstat (limited to 'openstack/etc/glance/glance-api.conf')
-rw-r--r--openstack/etc/glance/glance-api.conf5
1 files changed, 2 insertions, 3 deletions
diff --git a/openstack/etc/glance/glance-api.conf b/openstack/etc/glance/glance-api.conf
index 15b88532..bec62075 100644
--- a/openstack/etc/glance/glance-api.conf
+++ b/openstack/etc/glance/glance-api.conf
@@ -667,9 +667,8 @@ connection=sqlite:////var/lib/glance/glance.sqlite
#db_max_retries = 20
[keystone_authtoken]
-auth_host = ##OPENSTACK_AUTH_HOST##
-auth_port = 35357
-auth_protocol = http
+auth_uri = ##KEYSTONE_PUBLIC_URL##
+identity_uri = ##IDENTITY_URI##
admin_tenant_name = service
admin_user = ##GLANCE_SERVICE_USER##
admin_password = ##GLANCE_SERVICE_PASSWORD##