openstack/puppet-nova
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: I92398c6aa45c898291d0cff3fbf4bac8abc185b6
Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
This commit is contained in:
Takashi Kajinami
2025-09-03 10:30:30 +09:00
parent edf1297708
commit 5f745d39e3
3 changed files with 4 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
manifests/init.pp
View File

@@ -351,18 +351,6 @@
# cell, for operations requires cross cell data gathering.
# 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 nova (
$ensure_package = 'present',
$default_transport_url = $facts['os_service_default'],
@@ -432,7 +420,6 @@ class nova (
$instance_name_template = $facts['os_service_default'],
$cell_worker_thread_pool_size = $facts['os_service_default'],
# DEPRECATED PARAMETERS
$rabbit_heartbeat_in_pthread = undef,
$use_ssl = undef,
$enabled_ssl_apis = undef,
$ca_file = undef,
@@ -526,7 +513,6 @@ class nova (
rabbit_use_ssl => $rabbit_use_ssl,
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,
kombu_reconnect_delay => $kombu_reconnect_delay,
kombu_failover_strategy => $kombu_failover_strategy,

4
releasenotes/notes/remove-rabbit_heartbeat_in_pthread-1815c2c9f0239a46.yaml Normal file
View File

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

3
spec/classes/nova_init_spec.rb
View File

@@ -36,7 +36,6 @@ describe 'nova' do
:rabbit_use_ssl => '<SERVICE DEFAULT>',
:heartbeat_timeout_threshold => '<SERVICE DEFAULT>',
:heartbeat_rate => '<SERVICE DEFAULT>',
:heartbeat_in_pthread => nil,
:rabbit_qos_prefetch_count => '<SERVICE DEFAULT>',
:kombu_reconnect_delay => '<SERVICE DEFAULT>',
:kombu_failover_strategy => '<SERVICE DEFAULT>',
@@ -112,7 +111,6 @@ describe 'nova' do
:rabbit_use_ssl => true,
:rabbit_heartbeat_timeout_threshold => '60',
:rabbit_heartbeat_rate => '10',
:rabbit_heartbeat_in_pthread => true,
:rabbit_qos_prefetch_count => 0,
:kombu_reconnect_delay => '5.0',
:amqp_durable_queues => true,
@@ -189,7 +187,6 @@ describe 'nova' do
:rabbit_use_ssl => true,
:heartbeat_timeout_threshold => '60',
:heartbeat_rate => '10',
:heartbeat_in_pthread => true,
:rabbit_qos_prefetch_count => 0,
:kombu_reconnect_delay => '5.0',
:amqp_durable_queues => true,