openstack/puppet-glance
Code Issues Proposed changes

Remove support for [oslo_messaging_rabbit] heartbeat_in_pthread

Browse Source 
This feature was introduced to fix missing heartbeat in api services
run by external server mechanism (independent from eventlet).

However glance api does not use eventlet in this deployment pattern so
this parameter has no effect.

Because this option is deprecated and highly discouraged now due to
its incompatibility with eventlet, remove it early before the option
is actually removed.

Change-Id: Ib7a8d4983210c084d83599b4a69623371b09ca9b
Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
This commit is contained in:
Takashi Kajinami
2025-09-03 10:58:06 +09:00
parent d08f45f0d3
commit 91491d4b37
3 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
manifests/notify/rabbitmq.pp
View File

@@ -159,16 +159,6 @@
# (Optional) AMQP topic used for OpenStack notifications. (list value)
# Defaults to undef
#
# [*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 glance::notify::rabbitmq (
$default_transport_url = $facts['os_service_default'],
$rpc_response_timeout = $facts['os_service_default'],
@@ -203,7 +193,6 @@ class glance::notify::rabbitmq (
$notification_retry = $facts['os_service_default'],
# DEPRECATED PARAMETERS
$rabbit_notification_topic = undef,
$rabbit_heartbeat_in_pthread = undef,
) {
include glance::deps
@@ -219,7 +208,6 @@ Use the notification_topic parameter instead.")
rabbit_ha_queues => $rabbit_ha_queues,
heartbeat_timeout_threshold => $rabbit_heartbeat_timeout_threshold,
heartbeat_rate => $rabbit_heartbeat_rate,
heartbeat_in_pthread => $rabbit_heartbeat_in_pthread,
rabbit_qos_prefetch_count => $rabbit_qos_prefetch_count,
rabbit_use_ssl => $rabbit_use_ssl,
kombu_ssl_ca_certs => $kombu_ssl_ca_certs,

5
releasenotes/notes/remove-rabbit_heartbeat_in_pthread-4d1dcf3c74088cc5.yaml Normal file
View File

@@ -0,0 +1,5 @@
---
upgrade:
- |
The ``glance::notify::rabbitmq::rabbit_heartbeat_in_pthread`` parameter has
been removed.

3
spec/classes/glance_notify_rabbitmq_spec.rb
View File

@@ -7,7 +7,6 @@ describe 'glance::notify::rabbitmq' do
:rabbit_ha_queues => '<SERVICE DEFAULT>',
:heartbeat_timeout_threshold => '<SERVICE DEFAULT>',
:heartbeat_rate => '<SERVICE DEFAULT>',
:heartbeat_in_pthread => nil,
:rabbit_qos_prefetch_count => '<SERVICE DEFAULT>',
:rabbit_use_ssl => '<SERVICE DEFAULT>',
:kombu_ssl_ca_certs => '<SERVICE DEFAULT>',
@@ -55,7 +54,6 @@ describe 'glance::notify::rabbitmq' do
:rabbit_ha_queues => true,
:rabbit_heartbeat_timeout_threshold => '60',
:rabbit_heartbeat_rate => '10',
:rabbit_heartbeat_in_pthread => true,
:rabbit_qos_prefetch_count => 0,
:rabbit_quorum_queue => true,
:rabbit_transient_quorum_queue => true,
@@ -87,7 +85,6 @@ describe 'glance::notify::rabbitmq' do
:rabbit_ha_queues => true,
:heartbeat_timeout_threshold => '60',
:heartbeat_rate => '10',
:heartbeat_in_pthread => true,
:rabbit_qos_prefetch_count => 0,
:rabbit_use_ssl => true,
:kombu_ssl_ca_certs => '/etc/ca.cert',