Remove rabbit_max_retries option

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

Change-Id: I0ec9f905a2e07bc6fef8cfe5ca64b542c36dc7c0
This commit is contained in:
ZhongShengping 2018-06-01 14:38:42 +08:00
parent dd49693665
commit e02822a3f6
2 changed files with 3 additions and 12 deletions

View File

@ -291,12 +291,6 @@
# in the watcher config.
# Defaults to false.
#
# DEPRECATED PARAMETERS
#
# [*rabbit_max_retries*]
# (Optional) Maximum number of RabbitMQ connection retries. (integer value)
# Defaults to undef
#
# === Authors
#
# Daniel Pawlik <daniel.pawlik@corp.ovh.com>
@ -367,8 +361,6 @@ class watcher (
$notification_transport_url = $::os_service_default,
$notification_driver = $::os_service_default,
$notification_topics = $::os_service_default,
# DEPRECATED PARAMETERS
$rabbit_max_retries = undef,
) {
include ::openstacklib::openstackclient
@ -379,10 +371,6 @@ class watcher (
include ::watcher::db
include ::watcher::logging
if $rabbit_max_retries {
warning('The rabbit_max_retries parameter has been deprecated and will be removed in the future release.')
}
package { 'watcher':
ensure => $package_ensure,
name => $::watcher::params::common_package_name,

View File

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