openstack/puppet-oslo
Code Issues Proposed changes

Remove rabbit_max_retries option

Browse Source 
The rabbit_max_retries parameter has been deprecated for one year.
We can remove it.

Change-Id: Ic6c3ae68ba30054644fde79b60b205546a3013d3
This commit is contained in:
ZhongShengping 2018-06-01 15:03:02 +08:00
parent 7f0e5e1216
commit e996ecf807
2 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manifests/messaging/rabbit.pp
View File

@ -129,12 +129,6 @@
# we check the heartbeat. (integer value) # we check the heartbeat. (integer value)
# Defaults to $::os_service_default # Defaults to $::os_service_default
# #
# DEPRECATED PARAMETERS
#
# [*rabbit_max_retries*]
# (Optional) Maximum number of RabbitMQ connection retries. (integer value)
# Defaults to undef
#
define oslo::messaging::rabbit( define oslo::messaging::rabbit(
$amqp_durable_queues = $::os_service_default, $amqp_durable_queues = $::os_service_default,
$kombu_ssl_version = $::os_service_default, $kombu_ssl_version = $::os_service_default,
@ -161,8 +155,6 @@ define oslo::messaging::rabbit(
$rabbit_transient_queues_ttl = $::os_service_default, $rabbit_transient_queues_ttl = $::os_service_default,
$heartbeat_timeout_threshold = $::os_service_default, $heartbeat_timeout_threshold = $::os_service_default,
$heartbeat_rate = $::os_service_default, $heartbeat_rate = $::os_service_default,
# DEPRECATED PARAMETERS
$rabbit_max_retries = undef,
){ ){
if $rabbit_use_ssl != true { if $rabbit_use_ssl != true {
@ -180,10 +172,6 @@ define oslo::messaging::rabbit(
} }
} }
if $rabbit_max_retries {
warning('The rabbit_max_retries parameter has been deprecated and will be removed in the future release.')
}
if !is_service_default($kombu_compression) and !($kombu_compression in ['gzip','bz2']) { if !is_service_default($kombu_compression) and !($kombu_compression in ['gzip','bz2']) {
fail('Unsupported Kombu compression. Possible values are gzip and bz2') fail('Unsupported Kombu compression. Possible values are gzip and bz2')
} }

3
releasenotes/notes/remove_deprecated_rabbit_max_retries_option-86f90600cb43f6c1.yaml Normal file
View File

@ -0,0 +1,3 @@
---
upgrade:
- Deprecated rabbit_max_retries option has been removed.