openstack/glance
Code Issues Proposed changes

Merge "Use identity_uri instead of older fragments"

Browse Source
This commit is contained in:
Jenkins 2014-09-30 22:13:23 +00:00 committed by Gerrit Code Review
commit 116c1de000
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
etc/glance-api.conf
View File

@ -665,9 +665,7 @@ image_cache_dir = /var/lib/glance/image-cache/
#db_max_retries = 20 #db_max_retries = 20
[keystone_authtoken] [keystone_authtoken]
auth_host = 127.0.0.1 identity_uri = http://127.0.0.1:35357
auth_port = 35357
auth_protocol = http
admin_tenant_name = %SERVICE_TENANT_NAME% admin_tenant_name = %SERVICE_TENANT_NAME%
admin_user = %SERVICE_USER% admin_user = %SERVICE_USER%
admin_password = %SERVICE_PASSWORD% admin_password = %SERVICE_PASSWORD%

4
etc/glance-registry.conf
View File

@ -221,9 +221,7 @@ qpid_tcp_nodelay = True
#db_max_retries = 20 #db_max_retries = 20
[keystone_authtoken] [keystone_authtoken]
auth_host = 127.0.0.1 identity_uri = http://127.0.0.1:35357
auth_port = 35357
auth_protocol = http
admin_tenant_name = %SERVICE_TENANT_NAME% admin_tenant_name = %SERVICE_TENANT_NAME%
admin_user = %SERVICE_USER% admin_user = %SERVICE_USER%
admin_password = %SERVICE_PASSWORD% admin_password = %SERVICE_PASSWORD%