From 4e99faff68220f2e37092a0997fddd15b2e78909 Mon Sep 17 00:00:00 2001 From: Jens Rosenboom Date: Fri, 29 Apr 2016 15:29:26 +0200 Subject: [PATCH] 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 --- recipes/common.rb | 3 ++- spec/spec_helper.rb | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/recipes/common.rb b/recipes/common.rb index 23b0da8..eae1765 100644 --- a/recipes/common.rb +++ b/recipes/common.rb @@ -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 diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 83dd405..e36ce5d 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -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