From e0ff1e251da99d24fff0ba7e58371f4a711c7d95 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Sat, 30 Aug 2025 23:36:22 +0900
Subject: [PATCH] Remove support for [oslo_messaging_rabbit]
 heartbeat_in_pthread

Ceilometer 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: Iab5ae90de87b4dedc30bdad48d45957317a1eec7
Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
---
 manifests/init.pp                                    | 12 ------------
 ...rabbit_heartbeat_in_pthread-357ba1c49a43fef8.yaml |  4 ++++
 spec/classes/ceilometer_init_spec.rb                 |  3 ---
 3 files changed, 4 insertions(+), 15 deletions(-)
 create mode 100644 releasenotes/notes/remove-rabbit_heartbeat_in_pthread-357ba1c49a43fef8.yaml

diff --git a/manifests/init.pp b/manifests/init.pp
index 590e4025..2ae03205 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -180,16 +180,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.
-#   undef
-#
 # [*http_timeout*]
 #   (Optional) Timeout seconds for HTTP requests.
 #   Defaults to undef
@@ -232,7 +222,6 @@ class ceilometer (
   Boolean $purge_config               = false,
   $host                               = $facts['os_service_default'],
   # DEPRECATED PARAMETERS
-  $rabbit_heartbeat_in_pthread        = undef,
   $http_timeout                       = undef,
 ) {
   include ceilometer::deps
@@ -256,7 +245,6 @@ class ceilometer (
     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,
     amqp_durable_queues             => $amqp_durable_queues,
     amqp_auto_delete                => $amqp_auto_delete,
diff --git a/releasenotes/notes/remove-rabbit_heartbeat_in_pthread-357ba1c49a43fef8.yaml b/releasenotes/notes/remove-rabbit_heartbeat_in_pthread-357ba1c49a43fef8.yaml
new file mode 100644
index 00000000..6165b38d
--- /dev/null
+++ b/releasenotes/notes/remove-rabbit_heartbeat_in_pthread-357ba1c49a43fef8.yaml
@@ -0,0 +1,4 @@
+---
+upgrade:
+  - |
+    The ``ceilometer::rabbit_heartbeat_in_pthread`` parameter has been removed.
diff --git a/spec/classes/ceilometer_init_spec.rb b/spec/classes/ceilometer_init_spec.rb
index 9510927c..86ddc7ef 100644
--- a/spec/classes/ceilometer_init_spec.rb
+++ b/spec/classes/ceilometer_init_spec.rb
@@ -147,7 +147,6 @@ describe 'ceilometer' 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>',
         :amqp_durable_queues             => '<SERVICE DEFAULT>',
         :amqp_auto_delete                => '<SERVICE DEFAULT>',
@@ -190,13 +189,11 @@ describe 'ceilometer' do
       before { params.merge!(
         :rabbit_heartbeat_timeout_threshold => '60',
         :rabbit_heartbeat_rate              => '10',
-        :rabbit_heartbeat_in_pthread        => true,
       ) }
 
       it { is_expected.to contain_oslo__messaging__rabbit('ceilometer_config').with(
         :heartbeat_timeout_threshold => '60',
         :heartbeat_rate              => '10',
-        :heartbeat_in_pthread        => true,
       ) }
     end
   end