From 4d1d570b52cb081206954f3b5ad1b79973e74b1d Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Tue, 18 Feb 2025 10:56:44 +0900
Subject: [PATCH] Deprecate support for [oslo_messaging_rabbit]
 heartbeat_in_pthread

... because the option has been deprecated.

Depends-on: https://review.opendev.org/925778
Change-Id: I7a41ca937e18aa51fdc410bd262773826c0aae1b
---
 manifests/init.pp                             | 25 +++++++++++--------
 ...heartbeat_in_pthread-644ca905479767d6.yaml |  5 ++++
 2 files changed, 19 insertions(+), 11 deletions(-)
 create mode 100644 releasenotes/notes/deprecate-rabbit_heartbeat_in_pthread-644ca905479767d6.yaml

diff --git a/manifests/init.pp b/manifests/init.pp
index c8828ac..31d5c6b 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -53,16 +53,6 @@
 #   every 30 seconds.
 #   Defaults to $facts['os_service_default']
 #
-# [*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 $facts['os_service_default']
-#
 # [*rabbit_qos_prefetch_count*]
 #   (Optional) Specifies the number of messages to prefetch.
 #   Defaults to $facts['os_service_default']
@@ -183,6 +173,18 @@
 #   heartbeat.
 #   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 mistral(
   $package_ensure                     = 'present',
   $os_actions_endpoint_type           = $facts['os_service_default'],
@@ -195,7 +197,6 @@ class mistral(
   $rabbit_ha_queues                   = $facts['os_service_default'],
   $rabbit_heartbeat_timeout_threshold = $facts['os_service_default'],
   $rabbit_heartbeat_rate              = $facts['os_service_default'],
-  $rabbit_heartbeat_in_pthread        = $facts['os_service_default'],
   $rabbit_qos_prefetch_count          = $facts['os_service_default'],
   $rabbit_quorum_queue                = $facts['os_service_default'],
   $rabbit_transient_quorum_queue      = $facts['os_service_default'],
@@ -218,6 +219,8 @@ class mistral(
   $max_missed_heartbeats              = $facts['os_service_default'],
   $check_interval                     = $facts['os_service_default'],
   $first_heartbeat_timeout            = $facts['os_service_default'],
+  # DEPRECATED PARAMETERS
+  $rabbit_heartbeat_in_pthread        = undef,
 ){
 
   include mistral::deps
diff --git a/releasenotes/notes/deprecate-rabbit_heartbeat_in_pthread-644ca905479767d6.yaml b/releasenotes/notes/deprecate-rabbit_heartbeat_in_pthread-644ca905479767d6.yaml
new file mode 100644
index 0000000..5012e30
--- /dev/null
+++ b/releasenotes/notes/deprecate-rabbit_heartbeat_in_pthread-644ca905479767d6.yaml
@@ -0,0 +1,5 @@
+---
+deprecations:
+  - |
+    The ``mistral::rabbit_heartbeat_in_pthread`` parameter has been deprecated
+    and will be removed in the future release.