From 7c167c48051043c73dd67053c63ac57a19a29acf Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Wed, 3 Sep 2025 10:28:05 +0900 Subject: [PATCH] Remove support for [oslo_messaging_rabbit] heartbeat_in_pthread Cloudkitty does not use eventlet so this option has no effect. The option was deprecated as part of community-wide effort to remove eventlet. Change-Id: Ic034551f2911a8e79a7ec65f5b2183b1c753d5d1 Signed-off-by: Takashi Kajinami --- manifests/init.pp | 15 --------------- ...bit_heartbeat_in_pthread-bc53c14d6c78aa05.yaml | 4 ++++ spec/classes/cloudkitty_init_spec.rb | 3 --- 3 files changed, 4 insertions(+), 18 deletions(-) create mode 100644 releasenotes/notes/remove-rabbit_heartbeat_in_pthread-bc53c14d6c78aa05.yaml diff --git a/manifests/init.pp b/manifests/init.pp index 1e6aa1c..03d1de1 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -210,18 +210,6 @@ # (Optional) A hash of the metrics.yaml configuration. # Defaults to undef # -# 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 cloudkitty ( $package_ensure = 'present', $rabbit_use_ssl = $facts['os_service_default'], @@ -267,8 +255,6 @@ class cloudkitty ( $storage_version = $facts['os_service_default'], $fetcher_backend = $facts['os_service_default'], Optional[Hash] $metrics_config = undef, - # DEPRECATED PARAMETERS - $rabbit_heartbeat_in_pthread = undef, ) { include cloudkitty::params include cloudkitty::db @@ -292,7 +278,6 @@ class cloudkitty ( amqp_auto_delete => $amqp_auto_delete, 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_ssl_version => $kombu_ssl_version, kombu_ssl_keyfile => $kombu_ssl_keyfile, diff --git a/releasenotes/notes/remove-rabbit_heartbeat_in_pthread-bc53c14d6c78aa05.yaml b/releasenotes/notes/remove-rabbit_heartbeat_in_pthread-bc53c14d6c78aa05.yaml new file mode 100644 index 0000000..6afa190 --- /dev/null +++ b/releasenotes/notes/remove-rabbit_heartbeat_in_pthread-bc53c14d6c78aa05.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - | + The ``cloudkitty::heartbeat_in_pthread`` parameter has been removed. diff --git a/spec/classes/cloudkitty_init_spec.rb b/spec/classes/cloudkitty_init_spec.rb index e6a5e3c..55101cc 100644 --- a/spec/classes/cloudkitty_init_spec.rb +++ b/spec/classes/cloudkitty_init_spec.rb @@ -31,7 +31,6 @@ describe 'cloudkitty' do :rabbit_use_ssl => '', :heartbeat_timeout_threshold => '', :heartbeat_rate => '', - :heartbeat_in_pthread => nil, :kombu_reconnect_delay => '', :kombu_failover_strategy => '', :amqp_durable_queues => '', @@ -81,7 +80,6 @@ describe 'cloudkitty' do :rabbit_ha_queues => true, :rabbit_heartbeat_timeout_threshold => 60, :rabbit_heartbeat_rate => 10, - :rabbit_heartbeat_in_pthread => true, :rabbit_quorum_queue => true, :rabbit_qos_prefetch_count => 10, :rabbit_transient_quorum_queue => false, @@ -118,7 +116,6 @@ describe 'cloudkitty' do is_expected.to contain_oslo__messaging__rabbit('cloudkitty_config').with( :heartbeat_timeout_threshold => 60, :heartbeat_rate => 10, - :heartbeat_in_pthread => true, :kombu_reconnect_delay => 5.0, :amqp_durable_queues => true, :amqp_auto_delete => true,