openstack/puppet-watcher
Code Issues Proposed changes

Merge "Deprecate support for [oslo_messaging_rabbit] heartbeat_in_pthread"

Browse Source
This commit is contained in:
Zuul 2025-02-20 16:33:41 +00:00 committed by Gerrit Code Review
commit 4cda85f9bf
3 changed files with 20 additions and 12 deletions

25
manifests/init.pp

@ -35,16 +35,6 @@
# check the heartbeat.
# 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_ha_queues*]
# (optional) Use HA queues in RabbitMQ (x-ha-policy: all). If you change this
# option, you must wipe the RabbitMQ database.
@ -176,6 +166,18 @@
# in the watcher config.
# 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.
#
# === Authors
#
# Daniel Pawlik <daniel.pawlik@corp.ovh.com>
@ -188,7 +190,6 @@ class watcher (
$rabbit_interval_max = $facts['os_service_default'],
$rabbit_use_ssl = $facts['os_service_default'],
$rabbit_heartbeat_rate = $facts['os_service_default'],
$rabbit_heartbeat_in_pthread = $facts['os_service_default'],
$rabbit_ha_queues = $facts['os_service_default'],
$rabbit_quorum_queue = $facts['os_service_default'],
$rabbit_transient_quorum_queue = $facts['os_service_default'],
@ -215,6 +216,8 @@ class watcher (
$notification_topics = $facts['os_service_default'],
$notification_retry = $facts['os_service_default'],
Boolean $purge_config = false,
# DEPRECATED PARAMETERS
$rabbit_heartbeat_in_pthread = undef,
) {
include openstacklib::openstackclient

5
releasenotes/notes/deprecate-rabbit_heartbeat_in_pthread-22181d3776e58738.yaml Normal file

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

2
spec/classes/watcher_init_spec.rb

@ -36,7 +36,7 @@ describe 'watcher' do
:rabbit_use_ssl => '<SERVICE DEFAULT>',
:heartbeat_timeout_threshold => '<SERVICE DEFAULT>',
:heartbeat_rate => '<SERVICE DEFAULT>',
:heartbeat_in_pthread => '<SERVICE DEFAULT>',
:heartbeat_in_pthread => nil,
:kombu_reconnect_delay => '<SERVICE DEFAULT>',
:kombu_failover_strategy => '<SERVICE DEFAULT>',
:amqp_durable_queues => '<SERVICE DEFAULT>',