openstack/puppet-designate
Code Issues Proposed changes

Remove support for [oslo_messaging_rabbit] heartbeat_in_pthread

Browse Source 
This feature is known to break services using eventlet and is highly
discouraged now.

Change-Id: Ief7fa0772562612489c400339ea368ecf2d7a3ca
Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
This commit is contained in:
Takashi Kajinami
2025-09-03 10:37:10 +09:00
parent 40522faab1
commit fa5467c7bb
3 changed files with 4 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
manifests/init.pp
View File

@@ -183,18 +183,6 @@
# (Optional) Supported record types. # (Optional) Supported record types.
# 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
#
class designate ( class designate (
$package_ensure = present, $package_ensure = present,
$common_package_name = $designate::params::common_package_name, $common_package_name = $designate::params::common_package_name,
@@ -234,8 +222,6 @@ class designate (
$amqp_auto_delete = $facts['os_service_default'], $amqp_auto_delete = $facts['os_service_default'],
$default_ttl = $facts['os_service_default'], $default_ttl = $facts['os_service_default'],
$supported_record_type = $facts['os_service_default'], $supported_record_type = $facts['os_service_default'],
# DEPRECATED PARAMETERS
$rabbit_heartbeat_in_pthread = undef,
) inherits designate::params { ) inherits designate::params {
include designate::deps include designate::deps
@@ -260,7 +246,6 @@ class designate (
rabbit_ha_queues => $rabbit_ha_queues, rabbit_ha_queues => $rabbit_ha_queues,
heartbeat_timeout_threshold => $rabbit_heartbeat_timeout_threshold, heartbeat_timeout_threshold => $rabbit_heartbeat_timeout_threshold,
heartbeat_rate => $rabbit_heartbeat_rate, heartbeat_rate => $rabbit_heartbeat_rate,
heartbeat_in_pthread => $rabbit_heartbeat_in_pthread,
rabbit_qos_prefetch_count => $rabbit_qos_prefetch_count, rabbit_qos_prefetch_count => $rabbit_qos_prefetch_count,
amqp_durable_queues => $amqp_durable_queues, amqp_durable_queues => $amqp_durable_queues,
amqp_auto_delete => $amqp_auto_delete, amqp_auto_delete => $amqp_auto_delete,

4
releasenotes/notes/remove-rabbit_heartbeat_in_pthread-74480d054ce89452.yaml Normal file
View File

@@ -0,0 +1,4 @@
---
upgrade:
- |
The ``designate::rabbit_heartbeat_in_pthread`` parameter has been removed.

3
spec/classes/designate_init_spec.rb
View File

@@ -118,7 +118,6 @@ describe 'designate' do
:rabbit_ha_queues => '<SERVICE DEFAULT>', :rabbit_ha_queues => '<SERVICE DEFAULT>',
:heartbeat_timeout_threshold => '<SERVICE DEFAULT>', :heartbeat_timeout_threshold => '<SERVICE DEFAULT>',
:heartbeat_rate => '<SERVICE DEFAULT>', :heartbeat_rate => '<SERVICE DEFAULT>',
:heartbeat_in_pthread => nil,
:rabbit_qos_prefetch_count => '<SERVICE DEFAULT>', :rabbit_qos_prefetch_count => '<SERVICE DEFAULT>',
:amqp_durable_queues => '<SERVICE DEFAULT>', :amqp_durable_queues => '<SERVICE DEFAULT>',
:amqp_auto_delete => '<SERVICE DEFAULT>', :amqp_auto_delete => '<SERVICE DEFAULT>',
@@ -143,7 +142,6 @@ describe 'designate' do
:rabbit_ha_queues => true, :rabbit_ha_queues => true,
:rabbit_heartbeat_timeout_threshold => '60', :rabbit_heartbeat_timeout_threshold => '60',
:rabbit_heartbeat_rate => '10', :rabbit_heartbeat_rate => '10',
:rabbit_heartbeat_in_pthread => true,
:rabbit_qos_prefetch_count => 0, :rabbit_qos_prefetch_count => 0,
:rabbit_quorum_queue => true, :rabbit_quorum_queue => true,
:rabbit_transient_quorum_queue => true, :rabbit_transient_quorum_queue => true,
@@ -166,7 +164,6 @@ describe 'designate' do
:rabbit_ha_queues => true, :rabbit_ha_queues => true,
:heartbeat_timeout_threshold => '60', :heartbeat_timeout_threshold => '60',
:heartbeat_rate => '10', :heartbeat_rate => '10',
:heartbeat_in_pthread => true,
:rabbit_qos_prefetch_count => 0, :rabbit_qos_prefetch_count => 0,
:rabbit_quorum_queue => true, :rabbit_quorum_queue => true,
:rabbit_transient_quorum_queue => true, :rabbit_transient_quorum_queue => true,