openstack/puppet-heat
Code Issues Proposed changes

Configure clients_keystone with admin URL

Browse Source 
In Heat, [clients_keystone] auth_uri has to be the admin URL even we
would believe not.

It has been confired with how Heat's gate is running with Devstack and
also with TripleO CI currently failing with the current implementation.

Change-Id: I7a9d10b0a8092b3d0c70708b57637098cfe2b56d
This commit is contained in:
Emilien Macchi
2016-08-29 19:02:08 -04:00
parent 1d95c04dba
commit cd0c068d75
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
manifests/init.pp
View File

@@ -532,7 +532,6 @@ class heat(
}
$auth_url_real = pick($identity_uri, $::heat::keystone::authtoken::auth_url)
$auth_uri_real = pick($identity_uri, $::heat::keystone::authtoken::auth_uri)
$keystone_user_real = pick($keystone_user, $::heat::keystone::authtoken::username)
$keystone_password_real = pick($keystone_password, $::heat::keystone::authtoken::password)
$keystone_project_domain_name_real = pick($keystone_project_domain_name, $::heat::keystone::authtoken::project_domain_name)
@@ -547,7 +546,7 @@ class heat(
'trustee/user_domain_id': value => $keystone_user_domain_id;
'trustee/project_domain_name': value => $keystone_project_domain_name_real;
'trustee/user_domain_name': value => $keystone_user_domain_name_real;
'clients_keystone/auth_uri': value => $auth_uri_real;
'clients_keystone/auth_uri': value => $auth_url_real;
'clients_heat/url': value => $heat_clients_url;
}

2
spec/classes/heat_init_spec.rb
View File

@@ -124,7 +124,7 @@ describe 'heat' do
end
it 'configures auth_uri for clients_keystone' do
is_expected.to contain_heat_config('clients_keystone/auth_uri').with_value( 'http://127.0.0.1:5000/' )
is_expected.to contain_heat_config('clients_keystone/auth_uri').with_value( 'http://127.0.0.1:35357/' )
end
it 'configures keystone_ec2_uri' do