From ece5e90fddab233b97072ce9912753a702ce064a Mon Sep 17 00:00:00 2001 From: Jose Luis Franco Arza Date: Tue, 12 Sep 2017 15:25:26 +0200 Subject: [PATCH] Add support for default_user_data_format Allows specify the value of default_user_data_format parameter in configuration Change-Id: I0536b5efd0e1389b05ffdd29acf75f1fa748babb --- manifests/engine.pp | 14 ++++++++++++++ ..._default_user_data_format-712df91a3f826e51.yaml | 4 ++++ spec/classes/heat_engine_spec.rb | 3 +++ 3 files changed, 21 insertions(+) create mode 100644 releasenotes/notes/add_default_user_data_format-712df91a3f826e51.yaml diff --git a/manifests/engine.pp b/manifests/engine.pp index 6b313168..009189cb 100644 --- a/manifests/engine.pp +++ b/manifests/engine.pp @@ -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; diff --git a/releasenotes/notes/add_default_user_data_format-712df91a3f826e51.yaml b/releasenotes/notes/add_default_user_data_format-712df91a3f826e51.yaml new file mode 100644 index 00000000..7079812e --- /dev/null +++ b/releasenotes/notes/add_default_user_data_format-712df91a3f826e51.yaml @@ -0,0 +1,4 @@ +--- +features: + - Add new parameter 'default_user_data_format' + to specify the user_data format in the server. diff --git a/spec/classes/heat_engine_spec.rb b/spec/classes/heat_engine_spec.rb index da4ef71b..e46b11ac 100644 --- a/spec/classes/heat_engine_spec.rb +++ b/spec/classes/heat_engine_spec.rb @@ -14,6 +14,7 @@ describe 'heat::engine' do :deferred_auth_method => '', :default_software_config_transport => '', :default_deployment_signal_transport => '', + :default_user_data_format => '', :convergence_engine => '', :reauthentication_auth_method => '', :environment_dir => '', @@ -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('') } it { is_expected.to contain_heat_config('DEFAULT/instance_connection_https_validate_certificates').with_value('') } it { is_expected.to contain_heat_config('DEFAULT/max_resources_per_stack').with_value('') }