openstack/puppet-keystone
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: Id5bffc430ae18eef7e5a64eb96bb4dac4f598ce2
This commit is contained in:
Takashi Kajinami
2025-02-18 10:52:36 +09:00
parent 18df31d8fa
commit a5a027f100
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

@@ -82,16 +82,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']
@@ -366,6 +356,18 @@
# (Optional) Whether to use durable queues in AMQP. # (Optional) Whether to use durable queues in AMQP.
# Defaults to $facts['os_service_default']. # 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
#
# == Authors # == Authors
# #
# Dan Bode dan@puppetlabs.com # Dan Bode dan@puppetlabs.com
@@ -390,7 +392,6 @@ class keystone(
Boolean $enabled = true, Boolean $enabled = true,
$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_use_ssl = $facts['os_service_default'], $rabbit_use_ssl = $facts['os_service_default'],
$default_transport_url = $facts['os_service_default'], $default_transport_url = $facts['os_service_default'],
@@ -441,6 +442,8 @@ class keystone(
$max_request_body_size = $facts['os_service_default'], $max_request_body_size = $facts['os_service_default'],
Boolean $purge_config = false, Boolean $purge_config = false,
$amqp_durable_queues = $facts['os_service_default'], $amqp_durable_queues = $facts['os_service_default'],
# DEPRECATED PARAMETERS
$rabbit_heartbeat_in_pthread = undef,
) inherits keystone::params { ) inherits keystone::params {
include keystone::deps include keystone::deps

5
releasenotes/notes/deprecate-rabbit_heartbeat_in_pthread-9916241580c88e38.yaml Normal file
View File

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