openstack/puppet-heat
Code Issues Proposed changes

Add support for reauthentication_auth_method

Browse Source 
This adds support for setting reauthentication_auth_method
flag in heat.conf.

Change-Id: I247b02a50bb46ce16ca120961dd9c3df3e6026fd
Partial-Bug: #1683983
This commit is contained in:
rabi 2017-04-19 10:34:20 +05:30
parent 9cdeadec8c
commit 1b5eab2809
3 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/engine.pp
View File

@ -97,6 +97,10 @@
# (Optional) Enables engine with convergence architecture.
# Defaults to $::os_service_default.
#
# [*reauthentication_auth_method*]
# (Optional) Re-authentication method on token expiry.
# Defaults to $::os_service_default.
#
# [*environment_dir*]
# (Optional) The directory to search for environment files.
# Defaults to $::os_service_default
@ -128,6 +132,7 @@ class heat::engine (
$max_resources_per_stack = $::os_service_default,
$num_engine_workers = $::os_service_default,
$convergence_engine = $::os_service_default,
$reauthentication_auth_method = $::os_service_default,
$environment_dir = $::os_service_default,
$template_dir = $::os_service_default,
$max_nested_stack_depth = $::os_service_default,
@ -186,6 +191,7 @@ class heat::engine (
'DEFAULT/instance_connection_is_secure': value => $instance_connection_is_secure;
'DEFAULT/num_engine_workers': value => $num_engine_workers;
'DEFAULT/convergence_engine': value => $convergence_engine;
'DEFAULT/reauthentication_auth_method': value => $reauthentication_auth_method;
'DEFAULT/environment_dir': value => $environment_dir;
'DEFAULT/template_dir': value => $template_dir;
'DEFAULT/max_nested_stack_depth': value => $max_nested_stack_depth;

4
releasenotes/notes/add_reauthentication_config-64e6d3c7a5f8d261.yaml Normal file
View File

@ -0,0 +1,4 @@
---
features:
- Add new parameter 'reauthentication_auth_method' for
heat re-authentication configuration.

3
spec/classes/heat_engine_spec.rb
View File

@ -15,6 +15,7 @@ describe 'heat::engine' do
:default_software_config_transport => '<SERVICE DEFAULT>',
:default_deployment_signal_transport => '<SERVICE DEFAULT>',
:convergence_engine => '<SERVICE DEFAULT>',
:reauthentication_auth_method => '<SERVICE DEFAULT>',
:environment_dir => '<SERVICE DEFAULT>',
:template_dir => '<SERVICE DEFAULT>',
:max_nested_stack_depth => '<SERVICE DEFAULT>',
@ -44,6 +45,7 @@ describe 'heat::engine' do
:default_deployment_signal_transport => 'CFN_SIGNAL',
:num_engine_workers => '4',
:convergence_engine => false,
:reauthentication_auth_method => 'trusts',
:environment_dir => '/etc/heat/environment.d',
:template_dir => '/etc/heat/templates',
}
@ -88,6 +90,7 @@ describe 'heat::engine' do
it { is_expected.to contain_heat_config('DEFAULT/max_resources_per_stack').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_heat_config('DEFAULT/num_engine_workers').with_value( expected_params[:num_engine_workers] ) }
it { is_expected.to contain_heat_config('DEFAULT/convergence_engine').with_value( expected_params[:convergence_engine] ) }
it { is_expected.to contain_heat_config('DEFAULT/reauthentication_auth_method').with_value( expected_params[:reauthentication_auth_method] ) }
it { is_expected.to contain_heat_config('DEFAULT/environment_dir').with_value( expected_params[:environment_dir] ) }
it { is_expected.to contain_heat_config('DEFAULT/template_dir').with_value( expected_params[:template_dir] ) }
end