Browse Source

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
Jens Rosenboom 3 years ago
parent
commit
4e99faff68
2 changed files with 3 additions and 2 deletions
  1. 2
    1
      recipes/common.rb
  2. 1
    1
      spec/spec_helper.rb

+ 2
- 1
recipes/common.rb View File

@@ -74,6 +74,7 @@ api_cw_endpoint = internal_endpoint 'orchestration-api-cloudwatch'
74 74
 
75 75
 ec2_auth_uri = auth_uri_transform identity_endpoint.to_s, node['openstack']['orchestration']['ec2authtoken']['auth']['version']
76 76
 auth_uri = auth_uri_transform identity_endpoint.to_s, node['openstack']['orchestration']['api']['auth']['version']
77
+base_auth_uri = identity_uri_transform auth_uri
77 78
 
78 79
 # We need these URIs without their default path
79 80
 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|
85 86
   conf['DEFAULT']['heat_waitcondition_server_url'] = "#{api_cfn_endpoint}/waitcondition"
86 87
   conf['DEFAULT']['heat_watch_server_url'] = watch_uri
87 88
   conf['DEFAULT']['region_name_for_services'] = node['openstack']['region']
88
-  conf['clients_keystone']['auth_uri'] = auth_uri
89
+  conf['clients_keystone']['auth_uri'] = base_auth_uri
89 90
   conf['ec2authtoken']['auth_uri'] = ec2_auth_uri
90 91
   conf['heat_api']['bind_host'] = bind_address api_bind
91 92
   conf['heat_api']['bind_port'] = api_bind.port

+ 1
- 1
spec/spec_helper.rb View File

@@ -188,7 +188,7 @@ shared_examples 'expects to create heat conf' do
188 188
 
189 189
     describe 'has clients_keystone values' do
190 190
       it 'has default clients_keystone values' do
191
-        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$})
191
+        expect(chef_run).to render_config_file(file.name).with_section_content('clients_keystone', %r{^auth_uri = http://127.0.0.1:5000/$})
192 192
       end
193 193
     end
194 194
 

Loading…
Cancel
Save