openstack/openstack-ansible-os_glance
Code Issues Proposed changes

Update auth_uri / identity_uri

Browse Source 
While testing glance + swift, I noticed that the glance-api.conf and
glance-registry.conf being dropped had incorrect auth_uri /
identity_uri values set.  This change updates auth_uri / identity_uri
throughout to point to the correct keystone_service_adminuri /
keystone_service_internalurl variables.

Change-Id: I3cbbfefe7da54b08bb9a55e4a2ca3a8bd786577d
Closes-Bug: 1425099
This commit is contained in:
Matt Thompson 2015-02-24 14:32:51 +00:00
parent fc2e3a54b6
commit 24b09a92c5
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
templates/glance-api.conf.j2
View File

@ -42,8 +42,8 @@ connection = mysql://{{ glance_galera_user }}:{{ glance_container_mysql_password
[keystone_authtoken]
signing_dir = {{ glance_system_user_home }}/cache/api
identity_uri = {{ keystone_service_internaluri }}
auth_uri = {{ keystone_service_internaluri }}
identity_uri = {{ keystone_service_adminuri }}
auth_uri = {{ keystone_service_internalurl }}
admin_tenant_name = {{ glance_service_tenant_name }}
admin_user = {{ glance_service_user_name }}
admin_password = {{ glance_service_password }}

2
templates/glance-cache.conf.j2
View File

@ -12,5 +12,5 @@ image_cache_stall_time = 86400
image_cache_max_size = {{ glance_image_cache_max_size }}
registry_host = {{ glance_registry_host }}
registry_port = 9191
auth_url = {{ keystone_service_internaluri }}
auth_url = {{ keystone_service_internalurl }}
filesystem_store_datadir = {{ glance_system_user_home }}/images/

4
templates/glance-registry.conf.j2
View File

@ -20,8 +20,8 @@ connection = mysql://{{ glance_galera_user }}:{{ glance_container_mysql_password
[keystone_authtoken]
signing_dir = {{ glance_system_user_home }}/cache/registry/
identity_uri = {{ keystone_service_internaluri }}
auth_uri = {{ keystone_service_internaluri }}
identity_uri = {{ keystone_service_adminuri }}
auth_uri = {{ keystone_service_internalurl }}
admin_tenant_name = {{ glance_service_tenant_name }}
admin_user = {{ glance_service_user_name }}
admin_password = {{ glance_service_password }}