openstack/puppet-heat
Code Issues Proposed changes

Add support for default_user_data_format

Browse Source 
Allows specify the value of default_user_data_format
parameter in configuration

Change-Id: I0536b5efd0e1389b05ffdd29acf75f1fa748babb
This commit is contained in:
Jose Luis Franco Arza 2017-09-12 15:25:26 +02:00
parent 10a7db8463
commit ece5e90fdd
3 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
manifests/engine.pp
View File

@ -70,6 +70,18 @@
# endpoint which supports the provided keystone credentials (string value)
# Allowed values: CFN_SIGNAL, TEMP_URL_SIGNAL, HEAT_SIGNAL
# Defaults to $::os_service_default.
#
# [*default_user_data_format*]
# (optional) Template default for how the user_data should be
# formatted for the server. For HEAT_CFNTOOLS, the
# user_data is bundled as part of the heat-cfntools
# cloud-init boot configuration data. For RAW the
# user_data is passed to Nova unmodified. For
# SOFTWARE_CONFIG user_data is bundled as part of the
# software config data, and metadata is derived from any
# associated SoftwareDeployment resources.
# Allowed values: HEAT_CFNTOOLS, RAW, SOFTWARE_CONFIG
# Defaults to $::os_service_default.
# [*trusts_delegated_roles*]
# (optional) Array of trustor roles to be delegated to heat.
@ -126,6 +138,7 @@ class heat::engine (
$deferred_auth_method = $::os_service_default,
$default_software_config_transport = $::os_service_default,
$default_deployment_signal_transport = $::os_service_default,
$default_user_data_format = $::os_service_default,
$trusts_delegated_roles = $::os_service_default,
$instance_connection_is_secure = $::os_service_default,
$instance_connection_https_validate_certificates = $::os_service_default,
@ -184,6 +197,7 @@ class heat::engine (
'DEFAULT/engine_life_check_timeout': value => $engine_life_check_timeout;
'DEFAULT/default_software_config_transport': value => $default_software_config_transport;
'DEFAULT/default_deployment_signal_transport': value => $default_deployment_signal_transport;
'DEFAULT/default_user_data_format': value => $default_user_data_format;
'DEFAULT/trusts_delegated_roles': value => $trusts_delegated_roles;
'DEFAULT/deferred_auth_method': value => $deferred_auth_method;
'DEFAULT/max_resources_per_stack': value => $max_resources_per_stack;

4
releasenotes/notes/add_default_user_data_format-712df91a3f826e51.yaml Normal file
View File

@ -0,0 +1,4 @@
---
features:
- Add new parameter 'default_user_data_format'
to specify the user_data format in the server.

3
spec/classes/heat_engine_spec.rb
View File

@ -14,6 +14,7 @@ describe 'heat::engine' do
:deferred_auth_method => '<SERVICE DEFAULT>',
:default_software_config_transport => '<SERVICE DEFAULT>',
:default_deployment_signal_transport => '<SERVICE DEFAULT>',
:default_user_data_format => '<SERVICE DEFAULT>',
:convergence_engine => '<SERVICE DEFAULT>',
:reauthentication_auth_method => '<SERVICE DEFAULT>',
:environment_dir => '<SERVICE DEFAULT>',
@ -43,6 +44,7 @@ describe 'heat::engine' do
:deferred_auth_method => 'trusts',
:default_software_config_transport => 'POLL_SERVER_CFN',
:default_deployment_signal_transport => 'CFN_SIGNAL',
:default_user_data_format => 'HEAT_CFNTOOLS',
:num_engine_workers => '4',
:convergence_engine => false,
:reauthentication_auth_method => 'trusts',
@ -85,6 +87,7 @@ describe 'heat::engine' do
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_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/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>') }