openstack
/
puppet-heat
Code Issues Proposed changes

Add environment_dir and template_dir options 

Add environment_dir and template_dir options to config.

Change-Id: Ia1aba0d65906fef378472967cf28a79254e05f6b
This commit is contained in:
ZhongShengping 2016-08-04 11:45:34 +08:00
parent 5b5e0b3211
commit 519f974593
3 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manifests/engine.pp
View File

@ -97,6 +97,14 @@
# (Optional) Enables engine with convergence architecture.
# Defaults to $::os_service_default.
#
# [*environment_dir*]
# (Optional) The directory to search for environment files.
# Defaults to $::os_service_default
#
# [*template_dir*]
# (Optional) The directory to search for template files.
# Defaults to $::os_service_default
#
class heat::engine (
$auth_encryption_key,
$package_ensure = 'present',
@ -116,6 +124,8 @@ class heat::engine (
$max_resources_per_stack = $::os_service_default,
$num_engine_workers = $::os_service_default,
$convergence_engine = $::os_service_default,
$environment_dir = $::os_service_default,
$template_dir = $::os_service_default,
) {
include ::heat::deps
@ -171,5 +181,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/environment_dir': value => $environment_dir;
'DEFAULT/template_dir': value => $template_dir;
}
}

3
releasenotes/notes/add_environment_template_dir_parameters-56134e912ad9f417.yaml Normal file
View File

@ -0,0 +1,3 @@
---
features:
- Add environment_dir and template_dir options to config.

6
spec/classes/heat_engine_spec.rb
View File

@ -15,6 +15,8 @@ describe 'heat::engine' do
:default_software_config_transport => '<SERVICE DEFAULT>',
:default_deployment_signal_transport => '<SERVICE DEFAULT>',
:convergence_engine => '<SERVICE DEFAULT>',
:environment_dir => '<SERVICE DEFAULT>',
:template_dir => '<SERVICE DEFAULT>',
}
end
@ -35,6 +37,8 @@ describe 'heat::engine' do
:default_deployment_signal_transport => 'CFN_SIGNAL',
:num_engine_workers => '4',
:convergence_engine => false,
:environment_dir => '/etc/heat/environment.d',
:template_dir => '/etc/heat/templates',
}
].each do |new_params|
describe 'when #{param_set == {} ? "using default" : "specifying"} parameters'
@ -77,6 +81,8 @@ 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/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
context 'with disabled service managing' do