openstack/puppet-heat
Code Issues Proposed changes

Deprecate parameter heat_watch_server_url

Browse Source 
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
This commit is contained in:
schegi 2018-07-11 08:42:46 +02:00
parent aed49310c8
commit ae564bbd7c
3 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
manifests/engine.pp
View File

@ -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;

5
releasenotes/notes/deprecate-heat_watch_server_url-parameter-e26c07a99bd90b94.yaml Normal file
View File

@ -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.

3
spec/classes/heat_engine_spec.rb
View File

@ -8,7 +8,6 @@ describe 'heat::engine' do
:heat_stack_user_role => '<SERVICE DEFAULT>',
: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 => '<SERVICE DEFAULT>',
:trusts_delegated_roles => '<SERVICE DEFAULT>',
:deferred_auth_method => '<SERVICE DEFAULT>',
@ -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] ) }