openstack/puppet-heat
Code Issues Proposed changes

Merge "add missing num_engine_workers parameter"

Browse Source
This commit is contained in:
Jenkins 2016-04-14 22:43:16 +00:00 committed by Gerrit Code Review
commit fc324a840f
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/engine.pp
View File

@ -89,6 +89,10 @@
# (Optional) Maximum resources allowed per top-level stack.
# Defaults to $::os_service_default
#
# [*num_engine_workers*]
# (Optional) The number of workers to spawn.
# Defaults to $::os_service_default.
#
class heat::engine (
$auth_encryption_key,
$package_ensure = 'present',
@ -106,6 +110,7 @@ class heat::engine (
$instance_connection_is_secure = $::os_service_default,
$instance_connection_https_validate_certificates = $::os_service_default,
$max_resources_per_stack = $::os_service_default,
$num_engine_workers = $::os_service_default,
) {
include ::heat::deps
@ -159,5 +164,6 @@ class heat::engine (
'DEFAULT/max_resources_per_stack': value => $max_resources_per_stack;
'DEFAULT/instance_connection_https_validate_certificates': value => $instance_connection_https_validate_certificates;
'DEFAULT/instance_connection_is_secure': value => $instance_connection_is_secure;
'DEFAULT/num_engine_workers': value => $num_engine_workers;
}
}

2
spec/classes/heat_engine_spec.rb
View File

@ -32,6 +32,7 @@ describe 'heat::engine' do
:deferred_auth_method => 'trusts',
:default_software_config_transport => 'POLL_SERVER_CFN',
:default_deployment_signal_transport => 'CFN_SIGNAL',
:num_engine_workers => '4',
}
].each do |new_params|
describe 'when #{param_set == {} ? "using default" : "specifying"} parameters'
@ -72,6 +73,7 @@ describe 'heat::engine' do
it { is_expected.to contain_heat_config('DEFAULT/instance_connection_is_secure').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_heat_config('DEFAULT/instance_connection_https_validate_certificates').with_value('<SERVICE DEFAULT>') }
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] ) }
end
context 'with disabled service managing' do