From 213c858298228f5dcac7ba18139e124ad7cd7f54 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Sat, 30 Aug 2025 23:41:32 +0900 Subject: [PATCH] Remove support for [oslo_messaging_rabbit] heartbeat_in_pthread Heat no longer not uses eventlet so this option has no effect. The option was deprecated as part of community-wide effort to remove eventlet. Change-Id: I1aed6d4b8ec4681470578034bf0db23d0c0d646f Signed-off-by: Takashi Kajinami --- manifests/init.pp | 12 ------------ ...rabbit_heartbeat_in_pthread-cc8b903f5648bfbe.yaml | 4 ++++ spec/classes/heat_init_spec.rb | 4 ---- 3 files changed, 4 insertions(+), 16 deletions(-) create mode 100644 releasenotes/notes/remove-rabbit_heartbeat_in_pthread-cc8b903f5648bfbe.yaml diff --git a/manifests/init.pp b/manifests/init.pp index cd13c172..d885b937 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -224,16 +224,6 @@ # # 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 -# # [*enable_stack_adopt*] # (Optional) Enable the stack-adopt feature. # Defaults to undef. @@ -289,7 +279,6 @@ class heat ( $yaql_memory_quota = $facts['os_service_default'], $yaql_limit_iterators = $facts['os_service_default'], # DEPRECATED PARAMETERS - $rabbit_heartbeat_in_pthread = undef, $enable_stack_adopt = undef, $enable_stack_abandon = undef, ) { @@ -321,7 +310,6 @@ class heat ( kombu_compression => $kombu_compression, 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, amqp_durable_queues => $amqp_durable_queues, diff --git a/releasenotes/notes/remove-rabbit_heartbeat_in_pthread-cc8b903f5648bfbe.yaml b/releasenotes/notes/remove-rabbit_heartbeat_in_pthread-cc8b903f5648bfbe.yaml new file mode 100644 index 00000000..fcb10fd8 --- /dev/null +++ b/releasenotes/notes/remove-rabbit_heartbeat_in_pthread-cc8b903f5648bfbe.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - | + The ``heat::rabbit_heartbeat_in_pthread`` parameter has been removed. diff --git a/spec/classes/heat_init_spec.rb b/spec/classes/heat_init_spec.rb index bd9fb30d..453f5255 100644 --- a/spec/classes/heat_init_spec.rb +++ b/spec/classes/heat_init_spec.rb @@ -33,7 +33,6 @@ describe 'heat' do params.merge!( :rabbit_heartbeat_timeout_threshold => '60', :rabbit_heartbeat_rate => '10', - :rabbit_heartbeat_in_pthread => true ) end it_configures 'a heat base installation' @@ -140,7 +139,6 @@ describe 'heat' do :kombu_compression => '', :heartbeat_timeout_threshold => '', :heartbeat_rate => '', - :heartbeat_in_pthread => nil, :rabbit_qos_prefetch_count => '', :rabbit_use_ssl => '', :amqp_durable_queues => '', @@ -177,7 +175,6 @@ describe 'heat' do :kombu_compression => '', :heartbeat_timeout_threshold => '', :heartbeat_rate => '', - :heartbeat_in_pthread => nil, :rabbit_qos_prefetch_count => '', :rabbit_use_ssl => '', :amqp_durable_queues => true, @@ -208,7 +205,6 @@ describe 'heat' do :kombu_compression => '', :heartbeat_timeout_threshold => '60', :heartbeat_rate => '10', - :heartbeat_in_pthread => true, :rabbit_qos_prefetch_count => '', :rabbit_use_ssl => '', :amqp_durable_queues => '',