openstack
/
puppet-heat
Code Issues Proposed changes

Added missing enable_stack_abandon configuration option. 

Change-Id: I71f8aa8abb211ec25075d5dea2f8a9014fe22c28
Closes-Bug: #1415986
This commit is contained in:
Johannes Grassler 2015-01-29 17:54:16 +01:00 committed by Gael Chamoulaud
parent 89ca576fa6
commit c67c563416
2 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/engine.pp
View File

@ -30,6 +30,10 @@
# (optional) URL of the Heat cloudwatch server # (optional) URL of the Heat cloudwatch server
# Defaults to 'http://127.0.0.1:8003' # Defaults to 'http://127.0.0.1:8003'
# #
# [*enable_stack_abandon*]
# (optional) Whether to allow the stack-abandon operation.
# Defaults to false
#
# [*engine_life_check_timeout*] # [*engine_life_check_timeout*]
# (optional) RPC timeout (in seconds) for the engine liveness check that is # (optional) RPC timeout (in seconds) for the engine liveness check that is
# used for stack locking # used for stack locking
@ -65,6 +69,7 @@ class heat::engine (
$deferred_auth_method = 'trusts', $deferred_auth_method = 'trusts',
$trusts_delegated_roles = ['heat_stack_owner'], #DEPRECATED $trusts_delegated_roles = ['heat_stack_owner'], #DEPRECATED
$configure_delegated_roles = true, #DEPRECATED $configure_delegated_roles = true, #DEPRECATED
$enable_stack_abandon = false,
) { ) {
include ::heat::params include ::heat::params
@ -115,5 +120,6 @@ class heat::engine (
'DEFAULT/engine_life_check_timeout' : value => $engine_life_check_timeout; 'DEFAULT/engine_life_check_timeout' : value => $engine_life_check_timeout;
'DEFAULT/trusts_delegated_roles' : value => $trusts_delegated_roles; 'DEFAULT/trusts_delegated_roles' : value => $trusts_delegated_roles;
'DEFAULT/deferred_auth_method' : value => $deferred_auth_method; 'DEFAULT/deferred_auth_method' : value => $deferred_auth_method;
'DEFAULT/enable_stack_abandon' : value => $enable_stack_abandon;
} }
} }

21
spec/classes/heat_engine_spec.rb
View File

@ -75,6 +75,27 @@ describe 'heat::engine' do
end end
end end
context 'stack-abandon enabled' do
before do
params.merge!(
:enable_stack_abandon => true,
)
end
it { is_expected.to contain_heat_config('DEFAULT/enable_stack_abandon').with_value(true) }
end
context 'stack-abandon disabled' do
before do
params.merge!(
:enable_stack_abandon => false,
)
end
it { is_expected.to contain_heat_config('DEFAULT/enable_stack_abandon').with_value(false) }
end
context 'with disabled service managing' do context 'with disabled service managing' do
before do before do
params.merge!({ params.merge!({