Fix auth_uri in client_keystone section

In contrast to other identity URIs, the auth_uri in the client_keystone
section of heat.conf must be the unversioned identity endpoint,
otherwise most resources will not work.

Change-Id: I9888e0b69c3ba2a60e3ac7bb84261ace6688b9e3
This commit is contained in:
Jens Rosenboom 2016-04-29 15:29:26 +02:00
parent f950ab4b40
commit 4e99faff68
2 changed files with 3 additions and 2 deletions

View File

@ -74,6 +74,7 @@ api_cw_endpoint = internal_endpoint 'orchestration-api-cloudwatch'
ec2_auth_uri = auth_uri_transform identity_endpoint.to_s, node['openstack']['orchestration']['ec2authtoken']['auth']['version']
auth_uri = auth_uri_transform identity_endpoint.to_s, node['openstack']['orchestration']['api']['auth']['version']
base_auth_uri = identity_uri_transform auth_uri
# We need these URIs without their default path
metadata_uri = "#{api_cfn_endpoint.scheme}://#{api_cfn_endpoint.host}:#{api_cfn_endpoint.port}"
@ -85,7 +86,7 @@ node.default['openstack']['orchestration']['conf'].tap do |conf|
conf['DEFAULT']['heat_waitcondition_server_url'] = "#{api_cfn_endpoint}/waitcondition"
conf['DEFAULT']['heat_watch_server_url'] = watch_uri
conf['DEFAULT']['region_name_for_services'] = node['openstack']['region']
conf['clients_keystone']['auth_uri'] = auth_uri
conf['clients_keystone']['auth_uri'] = base_auth_uri
conf['ec2authtoken']['auth_uri'] = ec2_auth_uri
conf['heat_api']['bind_host'] = bind_address api_bind
conf['heat_api']['bind_port'] = api_bind.port

View File

@ -188,7 +188,7 @@ shared_examples 'expects to create heat conf' do
describe 'has clients_keystone values' do
it 'has default clients_keystone values' do
expect(chef_run).to render_config_file(file.name).with_section_content('clients_keystone', %r{^auth_uri = http://127.0.0.1:5000/v2.0$})
expect(chef_run).to render_config_file(file.name).with_section_content('clients_keystone', %r{^auth_uri = http://127.0.0.1:5000/$})
end
end