openstack
/
puppet-heat
Code Issues Proposed changes

Set endpoint_type to <SERVICE DEFAULT> 

Now TripleO sets this value, we can use os_service_default for
the default value and we won't have duplicated resource.

Change-Id: I00a47d6dae5be6ea18d93ac8b47c0c0cc58fe43f
This commit is contained in:
Emilien Macchi 2017-03-23 09:28:08 -04:00
parent 6635194603
commit 27a4d8a0cc
2 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
manifests/init.pp
View File

@ -269,11 +269,7 @@
# [*heat_clients_endpoint_type*]
# (optional) Type of endpoint in Identity service catalog to use for
# communication with the OpenStack service.
# TODO(emilien): change the default from false to $::os_service_default
# once TripleO use it correctly from hieratata.
# The default value is set to false now to avoid duplicated resources in
# TripleO puppet catalog.
# Defaults to false.
# Defaults to $::os_service_default.
#
# [*purge_config*]
# (optional) Whether to set only the specified config options
@ -381,7 +377,7 @@ class heat(
$notification_topics = $::os_service_default,
$enable_proxy_headers_parsing = $::os_service_default,
$heat_clients_url = $::os_service_default,
$heat_clients_endpoint_type = false,
$heat_clients_endpoint_type = $::os_service_default,
$purge_config = false,
$auth_strategy = 'keystone',
$yaql_memory_quota = $::os_service_default,
@ -487,12 +483,7 @@ deprecated. Please use heat::default_transport_url instead.")
'trustee/user_domain_name': value => $keystone_user_domain_name;
'clients_keystone/auth_uri': value => $auth_url;
'clients_heat/url': value => $heat_clients_url;
}
if $heat_clients_endpoint_type {
heat_config {
'clients/endpoint_type': value => $heat_clients_endpoint_type;
}
'clients/endpoint_type': value => $heat_clients_endpoint_type;
}
if (!is_service_default($enable_stack_adopt)) {

4
spec/classes/heat_init_spec.rb
View File

@ -142,6 +142,10 @@ describe 'heat' do
is_expected.to contain_heat_config('clients_keystone/auth_uri').with_value( 'http://127.0.0.1:35357/' )
end
it 'configures endpoint_type for clients' do
is_expected.to contain_heat_config('clients/endpoint_type').with_value( '<SERVICE DEFAULT>' )
end
it 'configures keystone_ec2_uri' do
is_expected.to contain_heat_config('ec2authtoken/auth_uri').with_value( params[:keystone_ec2_uri] )
end