openstack/puppet-heat
Code Issues Proposed changes

Add a parameter to be able to override clients_keystone/auth_uri.

Browse Source 
It is usually the same as auth_url which is defined there
$::heat::keystone::authtoken::auth_url.  We can now point this to
another part of the catalog (ie, public vs internal for instance).

Co-Authored-By: Sergii Golovatiuk <sgolovat@redhat.com>
Change-Id: I4429d86d831f49f1bc0fef04379a81ada20b6ab6
This commit is contained in:
Sofer Athlan-Guyot 2018-01-10 18:28:22 +01:00 committed by Sergii Golovatiuk
parent 42d4b40d76
commit 7870a0f8ff
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
manifests/init.pp
View File

@ -264,6 +264,10 @@
# (optional) Heat url in format like http://0.0.0.0:8004/v1/%(tenant_id)s.
# Defaults to $::os_service_default.
#
# [*heat_clients_keystone_uri*]
# (optional) Heat clients auth url in format like http://127.0.0.1:5000/.
# Defaults to $::os_service_default.
#
# [*heat_clients_endpoint_type*]
# (optional) Type of endpoint in Identity service catalog to use for
# communication with the OpenStack service.
@ -378,6 +382,7 @@ class heat(
$notification_topics = $::os_service_default,
$enable_proxy_headers_parsing = $::os_service_default,
$heat_clients_url = $::os_service_default,
$heat_clients_keystone_uri = $::os_service_default,
$heat_clients_endpoint_type = $::os_service_default,
$purge_config = false,
$auth_strategy = 'keystone',
@ -470,6 +475,12 @@ instead.")
$keystone_password = $::heat::keystone::authtoken::password
$keystone_project_domain_name = $::heat::keystone::authtoken::project_domain_name
$keystone_user_domain_name = $::heat::keystone::authtoken::user_domain_name
if (defined($heat_clients_keystone_uri)) {
$heat_clients_keystone_uri_real = $heat_clients_keystone_uri
} else {
$heat_clients_keystone_uri_real = $auth_url
}
heat_config {
'trustee/auth_type': value => 'password';
@ -478,7 +489,7 @@ instead.")
'trustee/password': value => $keystone_password, secret => true;
'trustee/project_domain_name': value => $keystone_project_domain_name;
'trustee/user_domain_name': value => $keystone_user_domain_name;
'clients_keystone/auth_uri': value => $auth_url;
'clients_keystone/auth_uri': value => $heat_clients_keystone_uri_real;
'clients_heat/url': value => $heat_clients_url;
'clients/endpoint_type': value => $heat_clients_endpoint_type;
}

5
spec/classes/heat_init_spec.rb
View File

@ -505,6 +505,11 @@ describe 'heat' do
end
end
shared_examples_for "with custom heat_clients_keystone_uri" do
before { params.merge!( :heat_clients_keystone_uri => 'https://domain1/' ) }
it { is_expected.to contain_heat_config('clients_keystone/auth_uri').with_value('https://domain1/') }
end
on_supported_os({
:supported_os => OSDefaults.get_supported_os
}).each do |os,facts|