From ae564bbd7c1f94c95c7a0ddbda26219d4f2f8a13 Mon Sep 17 00:00:00 2001 From: schegi Date: Wed, 11 Jul 2018 08:42:46 +0200 Subject: [PATCH] Deprecate parameter heat_watch_server_url When support for heat-api-cloudwatch was removed in I155c92edd5d6959ac23d99804fd95dfb99c7042e the parameter, heat_watch_server_url, was forgotten. This change marks the forgotten parameter as deprecated and removes it from the spec tests and heat config. Change-Id: Icb9fa01cb37dd15b66fc6f1de183149ff884363d Depends-On: https://review.openstack.org/581629 --- manifests/engine.pp | 20 ++++++++++++------- ...server_url-parameter-e26c07a99bd90b94.yaml | 5 +++++ spec/classes/heat_engine_spec.rb | 3 --- 3 files changed, 18 insertions(+), 10 deletions(-) create mode 100644 releasenotes/notes/deprecate-heat_watch_server_url-parameter-e26c07a99bd90b94.yaml diff --git a/manifests/engine.pp b/manifests/engine.pp index 6b8cf36e..51431620 100644 --- a/manifests/engine.pp +++ b/manifests/engine.pp @@ -35,10 +35,6 @@ # (optional) URL of the Heat waitcondition server # Defaults to $::os_service_default. # -# [*heat_watch_server_url*] -# (optional) URL of the Heat cloudwatch server -# Defaults to $::os_service_default. -# # [*engine_life_check_timeout*] # (optional) RPC timeout (in seconds) for the engine liveness check that is # used for stack locking @@ -87,7 +83,7 @@ # (optional) Array of trustor roles to be delegated to heat. # This value is also used by heat::keystone::auth if it is set to # configure the keystone roles. -# Defaults to $::os_service_default. +# Defaults to $::os_service_default. # # [*instance_connection_is_secure*] # (Optional) Instance connection to CFN/CW API via https. @@ -129,6 +125,12 @@ # (Optional) List of directories to search for plug-ins. # Defaults to $::os_service_default # +# DEPRECATED PARAMETERS +# +# [*heat_watch_server_url*] +# (optional) URL of the Heat cloudwatch server +# Defaults to undef. + class heat::engine ( $auth_encryption_key, $package_ensure = 'present', @@ -137,7 +139,6 @@ class heat::engine ( $heat_stack_user_role = $::os_service_default, $heat_metadata_server_url = $::os_service_default, $heat_waitcondition_server_url = $::os_service_default, - $heat_watch_server_url = $::os_service_default, $engine_life_check_timeout = $::os_service_default, $deferred_auth_method = $::os_service_default, $default_software_config_transport = $::os_service_default, @@ -154,10 +155,16 @@ class heat::engine ( $template_dir = $::os_service_default, $max_nested_stack_depth = $::os_service_default, $plugin_dirs = $::os_service_default, + # DEPRECATED PARAMETERS + $heat_watch_server_url = undef, ) { include ::heat::deps + if $heat_watch_server_url { + warning('heat_watch_server_url has no effect and will be removed in a future release.') + } + # Validate Heat Engine AES key # must be either 16, 24, or 32 bytes long # https://bugs.launchpad.net/heat/+bug/1415887 @@ -209,7 +216,6 @@ class heat::engine ( 'DEFAULT/heat_stack_user_role': value => $heat_stack_user_role; 'DEFAULT/heat_metadata_server_url': value => $heat_metadata_server_url; 'DEFAULT/heat_waitcondition_server_url': value => $heat_waitcondition_server_url; - 'DEFAULT/heat_watch_server_url': value => $heat_watch_server_url; '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; diff --git a/releasenotes/notes/deprecate-heat_watch_server_url-parameter-e26c07a99bd90b94.yaml b/releasenotes/notes/deprecate-heat_watch_server_url-parameter-e26c07a99bd90b94.yaml new file mode 100644 index 00000000..e69a3a73 --- /dev/null +++ b/releasenotes/notes/deprecate-heat_watch_server_url-parameter-e26c07a99bd90b94.yaml @@ -0,0 +1,5 @@ +--- +deprecations: + - heat_watch_server_url is deprecated and will be removed in a future + release. The Cloudwatch API support was removed from heat, so this parameter + does not have any effect. diff --git a/spec/classes/heat_engine_spec.rb b/spec/classes/heat_engine_spec.rb index 4fb21117..f4210863 100644 --- a/spec/classes/heat_engine_spec.rb +++ b/spec/classes/heat_engine_spec.rb @@ -8,7 +8,6 @@ describe 'heat::engine' do :heat_stack_user_role => '', :heat_metadata_server_url => 'http://127.0.0.1:8000', :heat_waitcondition_server_url => 'http://127.0.0.1:8000/v1/waitcondition', - :heat_watch_server_url => 'http://128.0.0.1:8003', :engine_life_check_timeout => '', :trusts_delegated_roles => '', :deferred_auth_method => '', @@ -39,7 +38,6 @@ describe 'heat::engine' do :heat_stack_user_role => 'heat_stack_user', :heat_metadata_server_url => 'http://127.0.0.1:8000', :heat_waitcondition_server_url => 'http://127.0.0.1:8000/v1/waitcondition', - :heat_watch_server_url => 'http://128.0.0.1:8003', :engine_life_check_timeout => '2', :trusts_delegated_roles => ['role1', 'role2'], :deferred_auth_method => 'trusts', @@ -82,7 +80,6 @@ describe 'heat::engine' do it { is_expected.to contain_heat_config('DEFAULT/heat_stack_user_role').with_value( expected_params[:heat_stack_user_role] ) } it { is_expected.to contain_heat_config('DEFAULT/heat_metadata_server_url').with_value( expected_params[:heat_metadata_server_url] ) } it { is_expected.to contain_heat_config('DEFAULT/heat_waitcondition_server_url').with_value( expected_params[:heat_waitcondition_server_url] ) } - it { is_expected.to contain_heat_config('DEFAULT/heat_watch_server_url').with_value( expected_params[:heat_watch_server_url] ) } it { is_expected.to contain_heat_config('DEFAULT/engine_life_check_timeout').with_value( expected_params[:engine_life_check_timeout] ) } it { is_expected.to contain_heat_config('DEFAULT/trusts_delegated_roles').with_value( expected_params[:trusts_delegated_roles] ) } it { is_expected.to contain_heat_config('DEFAULT/deferred_auth_method').with_value( expected_params[:deferred_auth_method] ) }