openstack/openstack-ansible
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 0596cefeca
commit 9f7159c1bb
8 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
playbooks/roles/os_cinder/templates/cinder.conf.j2
View File

@@ -90,8 +90,8 @@ connection = mysql://{{ cinder_galera_user }}:{{ cinder_container_mysql_password
[keystone_authtoken] [keystone_authtoken]
signing_dir = /var/cache/cinder signing_dir = /var/cache/cinder
identity_uri = {{ keystone_service_internaluri }} identity_uri = {{ keystone_service_adminuri }}
auth_uri = {{ keystone_service_internaluri }} auth_uri = {{ keystone_service_internalurl }}
admin_tenant_name = {{ cinder_service_tenant_name }} admin_tenant_name = {{ cinder_service_tenant_name }}
admin_user = {{ cinder_service_user_name }} admin_user = {{ cinder_service_user_name }}
admin_password = {{ cinder_service_password }} admin_password = {{ cinder_service_password }}

4
playbooks/roles/os_glance/templates/glance-api.conf.j2
View File

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

2
playbooks/roles/os_glance/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 }} image_cache_max_size = {{ glance_image_cache_max_size }}
registry_host = {{ glance_registry_host }} registry_host = {{ glance_registry_host }}
registry_port = 9191 registry_port = 9191
auth_url = {{ keystone_service_internaluri }} auth_url = {{ keystone_service_internalurl }}
filesystem_store_datadir = {{ glance_system_user_home }}/images/ filesystem_store_datadir = {{ glance_system_user_home }}/images/

4
playbooks/roles/os_glance/templates/glance-registry.conf.j2
View File

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

6
playbooks/roles/os_heat/templates/heat.conf.j2
View File

@@ -64,7 +64,7 @@ endpoint_type = {{ heat_client_endpoint }}
connection = mysql://{{ heat_galera_user }}:{{ heat_container_mysql_password }}@{{ galera_address }}/{{ heat_galera_database }}?charset=utf8 connection = mysql://{{ heat_galera_user }}:{{ heat_container_mysql_password }}@{{ galera_address }}/{{ heat_galera_database }}?charset=utf8
[ec2authtoken] [ec2authtoken]
auth_uri = {{ keystone_service_internaluri }} auth_uri = {{ keystone_service_internalurl }}
[heat_api] [heat_api]
bind_port = {{ heat_service_port }} bind_port = {{ heat_service_port }}
@@ -77,8 +77,8 @@ bind_port = {{ heat_watch_port }}
[keystone_authtoken] [keystone_authtoken]
signing_dir = /var/cache/heat signing_dir = /var/cache/heat
identity_uri = {{ keystone_service_internaluri }} identity_uri = {{ keystone_service_adminuri }}
auth_uri = {{ keystone_service_internaluri }} auth_uri = {{ keystone_service_internalurl }}
admin_tenant_name = {{ heat_service_tenant_name }} admin_tenant_name = {{ heat_service_tenant_name }}
admin_user = {{ heat_service_user_name }} admin_user = {{ heat_service_user_name }}
admin_password = {{ heat_service_password }} admin_password = {{ heat_service_password }}

2
playbooks/roles/os_neutron/templates/neutron.conf.j2
View File

@@ -97,7 +97,7 @@ root_helper = sudo /usr/local/bin/neutron-rootwrap /etc/neutron/rootwrap.conf
[keystone_authtoken] [keystone_authtoken]
signing_dir = /var/cache/neutron signing_dir = /var/cache/neutron
identity_uri = {{ keystone_service_internaluri }} identity_uri = {{ keystone_service_adminuri }}
auth_uri = {{ keystone_service_internalurl }} auth_uri = {{ keystone_service_internalurl }}
admin_tenant_name = {{ neutron_service_tenant_name }} admin_tenant_name = {{ neutron_service_tenant_name }}
admin_user = {{ neutron_service_user_name }} admin_user = {{ neutron_service_user_name }}

4
playbooks/roles/os_nova/templates/nova.conf.j2
View File

@@ -149,8 +149,8 @@ enabled = True
[keystone_authtoken] [keystone_authtoken]
signing_dir = {{ nova_system_home_folder }}/cache/api signing_dir = {{ nova_system_home_folder }}/cache/api
identity_uri = {{ keystone_service_internaluri }} identity_uri = {{ keystone_service_adminuri }}
auth_uri = {{ keystone_service_internaluri }} auth_uri = {{ keystone_service_internalurl }}
admin_tenant_name = {{ nova_service_tenant_name }} admin_tenant_name = {{ nova_service_tenant_name }}
admin_user = {{ nova_service_user_name }} admin_user = {{ nova_service_user_name }}
admin_password = {{ nova_service_password }} admin_password = {{ nova_service_password }}

4
playbooks/roles/os_swift/templates/proxy-server.conf.j2
View File

@@ -35,8 +35,8 @@ user_test_tester3 = testing3
{% elif swift_authtoken_active %} {% elif swift_authtoken_active %}
[filter:authtoken] [filter:authtoken]
paste.filter_factory = keystonemiddleware.auth_token:filter_factory paste.filter_factory = keystonemiddleware.auth_token:filter_factory
identity_uri = {{ keystone_service_internaluri }} identity_uri = {{ keystone_service_adminuri }}
auth_uri = {{ keystone_service_internaluri }} auth_uri = {{ keystone_service_internalurl }}
admin_tenant_name = {{ swift_service_tenant_name }} admin_tenant_name = {{ swift_service_tenant_name }}
admin_user = {{ swift_service_user_name }} admin_user = {{ swift_service_user_name }}
admin_password = {{ swift_service_password }} admin_password = {{ swift_service_password }}