openstack/puppet-aodh
Code Issues Proposed changes

Deprecate support for [oslo_messaging_rabbit] heartbeat_in_pthread

Browse Source 
... because the option has been deprecated.

Note that the deprecation warning may be added in puppet-oslo so is not
implemented in individual module.

Depends-on: https://review.opendev.org/925778
Change-Id: I83f663f5378e20cbb40f3c1d903f74634dfcd81e
This commit is contained in:
Takashi Kajinami
2025-02-18 10:32:22 +09:00
parent ff8c302be0
commit 825739a1d5
2 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
manifests/init.pp
View File

@@ -61,16 +61,6 @@
# every 30 seconds. # every 30 seconds.
# Defaults to $facts['os_service_default'] # Defaults to $facts['os_service_default']
# #
# [*rabbit_heartbeat_in_pthread*]
# (Optional) EXPERIMENTAL: Run the health check heartbeat thread
# through a native python thread. By default if this
# option isn't provided the health check heartbeat will
# inherit the execution model from the parent process. By
# example if the parent process have monkey patched the
# stdlib by using eventlet/greenlet then the heartbeat
# will be run through a green thread.
# Defaults to $facts['os_service_default']
#
# [*rabbit_qos_prefetch_count*] # [*rabbit_qos_prefetch_count*]
# (Optional) Specifies the number of messages to prefetch. # (Optional) Specifies the number of messages to prefetch.
# Defaults to $facts['os_service_default'] # Defaults to $facts['os_service_default']
@@ -183,6 +173,18 @@
# in the aodh config. # in the aodh config.
# Defaults to false. # Defaults to false.
# #
# DEPRECATED PARAMETERS
#
# [*rabbit_heartbeat_in_pthread*]
# (Optional) EXPERIMENTAL: Run the health check heartbeat thread
# through a native python thread. By default if this
# option isn't provided the health check heartbeat will
# inherit the execution model from the parent process. By
# example if the parent process have monkey patched the
# stdlib by using eventlet/greenlet then the heartbeat
# will be run through a green thread.
# Defaults to undef
#
class aodh ( class aodh (
$package_ensure = 'present', $package_ensure = 'present',
$alarm_history_time_to_live = $facts['os_service_default'], $alarm_history_time_to_live = $facts['os_service_default'],
@@ -194,7 +196,6 @@ class aodh (
$rabbit_use_ssl = $facts['os_service_default'], $rabbit_use_ssl = $facts['os_service_default'],
$rabbit_heartbeat_timeout_threshold = $facts['os_service_default'], $rabbit_heartbeat_timeout_threshold = $facts['os_service_default'],
$rabbit_heartbeat_rate = $facts['os_service_default'], $rabbit_heartbeat_rate = $facts['os_service_default'],
$rabbit_heartbeat_in_pthread = $facts['os_service_default'],
$rabbit_qos_prefetch_count = $facts['os_service_default'], $rabbit_qos_prefetch_count = $facts['os_service_default'],
$rabbit_ha_queues = $facts['os_service_default'], $rabbit_ha_queues = $facts['os_service_default'],
$rabbit_quorum_queue = $facts['os_service_default'], $rabbit_quorum_queue = $facts['os_service_default'],
@@ -220,6 +221,8 @@ class aodh (
$notification_topics = $facts['os_service_default'], $notification_topics = $facts['os_service_default'],
$notification_retry = $facts['os_service_default'], $notification_retry = $facts['os_service_default'],
Boolean $purge_config = false, Boolean $purge_config = false,
# DEPRECATED PARAMETERS
$rabbit_heartbeat_in_pthread = undef,
) inherits aodh::params { ) inherits aodh::params {
include aodh::deps include aodh::deps

5
releasenotes/notes/deprecate-rabbit_heartbeat_in_pthread-31d669acaccf209c.yaml Normal file
View File

@@ -0,0 +1,5 @@
---
deprecations:
- |
The ``aodh::rabbit_heartbeat_in_pthread`` parameter has been deprecated
and will be removed in the future release.