openstack
/
puppet-heat
Code Issues Proposed changes

Merge "Add server_keystone_endpoint_type param to heat::engine"

This commit is contained in:
Zuul 2020-03-26 23:37:56 +00:00 committed by Gerrit Code Review
parent 1084af6e86 093b663165
commit 9df2d37e69
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
manifests/engine.pp
View File

@ -78,7 +78,7 @@
# associated SoftwareDeployment resources.
# Allowed values: HEAT_CFNTOOLS, RAW, SOFTWARE_CONFIG
# Defaults to $::os_service_default.
#
# [*trusts_delegated_roles*]
# (optional) Array of trustor roles to be delegated to heat.
# This value is also used by heat::keystone::auth if it is set to
@ -129,12 +129,17 @@
# (Optional) Number of times to retry when client encounters a transient error.
# Defaults to $::os_service_default
#
# [*server_keystone_endpoint_type*]
# (Optional) If set, is used to control which authentication endpoint is used
# by user-controlled servers to make calls back to Heat.
# Defaults to $::os_service_default
#
# DEPRECATED PARAMETERS
#
# [*heat_watch_server_url*]
# (optional) URL of the Heat cloudwatch server
# Defaults to undef.
#
class heat::engine (
$auth_encryption_key,
$package_ensure = 'present',
@ -160,6 +165,7 @@ class heat::engine (
$max_nested_stack_depth = $::os_service_default,
$plugin_dirs = $::os_service_default,
$client_retry_limit = $::os_service_default,
$server_keystone_endpoint_type = $::os_service_default,
# DEPRECATED PARAMETERS
$heat_watch_server_url = undef,
) {
@ -239,5 +245,6 @@ class heat::engine (
'DEFAULT/max_nested_stack_depth': value => $max_nested_stack_depth;
'DEFAULT/plugin_dirs': value => $plugin_dirs_real;
'DEFAULT/client_retry_limit': value => $client_retry_limit;
'DEFAULT/server_keystone_endpoint_type': value => $server_keystone_endpoint_type;
}
}

4
releasenotes/notes/server_keystone_endpoint_type-82c3f461916653d8.yaml Normal file
View File

@ -0,0 +1,4 @@
---
features:
- |
Added server_keystone_endpoint_type parameter to heat::engine.

3
spec/classes/heat_engine_spec.rb
View File

@ -21,6 +21,7 @@ describe 'heat::engine' do
:max_nested_stack_depth => '<SERVICE DEFAULT>',
:plugin_dirs => '<SERVICE DEFAULT>',
:client_retry_limit => '<SERVICE DEFAULT>',
:server_keystone_endpoint_type => '<SERVICE DEFAULT>',
}
end
@ -51,6 +52,7 @@ describe 'heat::engine' do
:environment_dir => '/etc/heat/environment.d',
:template_dir => '/etc/heat/templates',
:client_retry_limit => 2,
:server_keystone_endpoint_type => 'public',
}
].each do |new_params|
describe 'when #{param_set == {} ? "using default" : "specifying"} parameters'
@ -98,6 +100,7 @@ describe 'heat::engine' do
it { is_expected.to contain_heat_config('DEFAULT/template_dir').with_value( expected_params[:template_dir] ) }
it { is_expected.to contain_heat_config('DEFAULT/plugin_dirs').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_heat_config('DEFAULT/client_retry_limit').with_value( expected_params[:client_retry_limit] ) }
it { is_expected.to contain_heat_config('DEFAULT/server_keystone_endpoint_type').with_value( expected_params[:server_keystone_endpoint_type] ) }
end
context 'with disabled service managing' do