openstack/puppet-heat
Code Issues Proposed changes

Ensure [DEFAULT] deferred_auth_method is purged

Browse Source 
... instead of left unmanaged. The parameter was deprecated a while ago
but is still valid in Heat.

Change-Id: I13c7c869855c60c9db1ca57772a2c0989b511e94
This commit is contained in:
Takashi Kajinami 2022-06-19 22:13:37 +09:00
parent 860681e667
commit 98c92fe15c
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/engine.pp
View File

@ -300,8 +300,8 @@ class heat::engine (
if $deferred_auth_method != undef { if $deferred_auth_method != undef {
warning('deferred_auth_method is deprecated and will be removed in a future release') warning('deferred_auth_method is deprecated and will be removed in a future release')
heat_config { }
'DEFAULT/deferred_auth_method': value => $deferred_auth_method; heat_config {
} 'DEFAULT/deferred_auth_method': value => pick($deferred_auth_method, $::os_service_default);
} }
} }

5
spec/classes/heat_engine_spec.rb
View File

@ -29,6 +29,7 @@ describe 'heat::engine' do
:max_nested_stack_depth => '<SERVICE DEFAULT>', :max_nested_stack_depth => '<SERVICE DEFAULT>',
:plugin_dirs => '<SERVICE DEFAULT>', :plugin_dirs => '<SERVICE DEFAULT>',
:server_keystone_endpoint_type => '<SERVICE DEFAULT>', :server_keystone_endpoint_type => '<SERVICE DEFAULT>',
:deferred_auth_method => '<SERVICE DEFAULT>',
} }
end end
@ -47,7 +48,6 @@ describe 'heat::engine' do
:heat_stack_user_role => 'heat_stack_user', :heat_stack_user_role => 'heat_stack_user',
:heat_metadata_server_url => 'http://127.0.0.1:8000', :heat_metadata_server_url => 'http://127.0.0.1:8000',
:heat_waitcondition_server_url => 'http://127.0.0.1:8000/v1/waitcondition', :heat_waitcondition_server_url => 'http://127.0.0.1:8000/v1/waitcondition',
:deferred_auth_method => 'trusts',
:default_software_config_transport => 'POLL_SERVER_CFN', :default_software_config_transport => 'POLL_SERVER_CFN',
:default_deployment_signal_transport => 'CFN_SIGNAL', :default_deployment_signal_transport => 'CFN_SIGNAL',
:default_user_data_format => 'HEAT_CFNTOOLS', :default_user_data_format => 'HEAT_CFNTOOLS',
@ -69,6 +69,7 @@ describe 'heat::engine' do
:template_dir => '/etc/heat/templates', :template_dir => '/etc/heat/templates',
:client_retry_limit => 2, :client_retry_limit => 2,
:server_keystone_endpoint_type => 'public', :server_keystone_endpoint_type => 'public',
:deferred_auth_method => 'trusts',
} }
].each do |new_params| ].each do |new_params|
describe 'when #{param_set == {} ? "using default" : "specifying"} parameters' describe 'when #{param_set == {} ? "using default" : "specifying"} parameters'
@ -100,7 +101,6 @@ describe 'heat::engine' do
it { is_expected.to contain_heat_config('DEFAULT/heat_stack_user_role').with_value( expected_params[:heat_stack_user_role] ) } it { is_expected.to contain_heat_config('DEFAULT/heat_stack_user_role').with_value( expected_params[:heat_stack_user_role] ) }
it { is_expected.to contain_heat_config('DEFAULT/heat_metadata_server_url').with_value( expected_params[:heat_metadata_server_url] ) } it { is_expected.to contain_heat_config('DEFAULT/heat_metadata_server_url').with_value( expected_params[:heat_metadata_server_url] ) }
it { is_expected.to contain_heat_config('DEFAULT/heat_waitcondition_server_url').with_value( expected_params[:heat_waitcondition_server_url] ) } it { is_expected.to contain_heat_config('DEFAULT/heat_waitcondition_server_url').with_value( expected_params[:heat_waitcondition_server_url] ) }
it { is_expected.to contain_heat_config('DEFAULT/deferred_auth_method').with_value( expected_params[:deferred_auth_method] ) }
it { is_expected.to contain_heat_config('DEFAULT/default_software_config_transport').with_value( expected_params[:default_software_config_transport] ) } it { is_expected.to contain_heat_config('DEFAULT/default_software_config_transport').with_value( expected_params[:default_software_config_transport] ) }
it { is_expected.to contain_heat_config('DEFAULT/default_deployment_signal_transport').with_value( expected_params[:default_deployment_signal_transport] ) } it { is_expected.to contain_heat_config('DEFAULT/default_deployment_signal_transport').with_value( expected_params[:default_deployment_signal_transport] ) }
it { is_expected.to contain_heat_config('DEFAULT/default_user_data_format').with_value( expected_params[:default_user_data_format] ) } it { is_expected.to contain_heat_config('DEFAULT/default_user_data_format').with_value( expected_params[:default_user_data_format] ) }
@ -127,6 +127,7 @@ describe 'heat::engine' do
it { is_expected.to contain_heat_config('DEFAULT/plugin_dirs').with_value('<SERVICE DEFAULT>') } 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/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] ) } it { is_expected.to contain_heat_config('DEFAULT/server_keystone_endpoint_type').with_value( expected_params[:server_keystone_endpoint_type] ) }
it { is_expected.to contain_heat_config('DEFAULT/deferred_auth_method').with_value( expected_params[:deferred_auth_method] ) }
end end
context 'with max limits are defined' do context 'with max limits are defined' do