Remove support for [oslo_messaging_rabbit] heartbeat_in_pthread

... in ironic-inspector.

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

Change-Id: Ie415eb18623259af931bcfad54d894080f7c4708
Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
This commit is contained in:
Takashi Kajinami
2025-09-03 11:03:43 +09:00
parent 8b0c302a75
commit 0441f9c7e0
3 changed files with 2 additions and 19 deletions

View File

@@ -329,18 +329,6 @@
# (optional) Whether to run ironic-inspector as a standalone service.
# Defaults to true
#
# 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 ironic::inspector (
$package_ensure = 'present',
Boolean $manage_service = true,
@@ -406,8 +394,6 @@ class ironic::inspector (
$amqp_durable_queues = $facts['os_service_default'],
$amqp_auto_delete = $facts['os_service_default'],
Boolean $standalone = true,
# DEPRECATED PARAMETERS
$rabbit_heartbeat_in_pthread = undef,
) inherits ironic::params {
include ironic::deps
include ironic::pxe::common
@@ -529,7 +515,6 @@ class ironic::inspector (
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,

View File

@@ -1,4 +1,5 @@
---
upgrade:
- |
The ``ironic::rabbit_heartbeat_in_pthread`` parameter has been removed.
The ``ironic::rabbit_heartbeat_in_pthread`` parameter and
the ``ironic::inspector::rabbit_heartbeat_in_pthread`` have been removed.

View File

@@ -136,7 +136,6 @@ describe 'ironic::inspector' 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>',
@@ -255,7 +254,6 @@ describe 'ironic::inspector' 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,
@@ -296,7 +294,6 @@ describe 'ironic::inspector' 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,