Deprecate support for [oslo_messaging_rabbit] heartbeat_in_pthread

... 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: Ifef35072f6323258767e71f3c50f81b5053f9273
This commit is contained in:
Takashi Kajinami 2025-02-18 10:43:27 +09:00
parent ef9eb05596
commit 4ba187b1b1
2 changed files with 19 additions and 11 deletions

@ -64,16 +64,6 @@
# every 30 seconds.
# 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*]
# (Optional) Specifies the number of messages to prefetch.
# Defaults to $facts['os_service_default']
@ -234,6 +224,18 @@
# internal tenant.
# Defaults to $facts['os_service_default'].
#
# 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 cinder (
$default_transport_url = $facts['os_service_default'],
$rpc_response_timeout = $facts['os_service_default'],
@ -246,7 +248,6 @@ class cinder (
$rabbit_ha_queues = $facts['os_service_default'],
$rabbit_heartbeat_timeout_threshold = $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_quorum_queue = $facts['os_service_default'],
$rabbit_transient_quorum_queue = $facts['os_service_default'],
@ -282,6 +283,8 @@ class cinder (
$enable_force_upload = $facts['os_service_default'],
$cinder_internal_tenant_project_id = $facts['os_service_default'],
$cinder_internal_tenant_user_id = $facts['os_service_default'],
# DEPRECATED PARAMETERS
$rabbit_heartbeat_in_pthread = undef,
) inherits cinder::params {
include cinder::deps

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