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

... because the option has been deprecated.

Note that the deprecation warning may be added in puppet-oslo so is not
implemented in individual module.

Depends-on: https://review.opendev.org/925778
Change-Id: Iec93666ffaab2aa33a3848834a85785dd2f5bc76
---
 manifests/init.pp                             | 22 +++++++++----------
 ...heartbeat_in_pthread-213cca7f00274660.yaml |  5 +++++
 2 files changed, 16 insertions(+), 11 deletions(-)
 create mode 100644 releasenotes/notes/deprecate-rabbit_heartbeat_in_pthread-213cca7f00274660.yaml

diff --git a/manifests/init.pp b/manifests/init.pp
index 093531a4a..38c35346b 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -57,16 +57,6 @@
 #   the heartbeat will be checked every 30 seconds. (integer value)
 #   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']
@@ -342,6 +332,16 @@
 #   (optional) The strategy to use for auth: noauth or keystone.
 #   Defaults to undef
 #
+# [*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 nova(
   $ensure_package                          = 'present',
   $default_transport_url                   = $facts['os_service_default'],
@@ -352,7 +352,6 @@ class nova(
   $rabbit_use_ssl                          = $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_ha_queues                        = $facts['os_service_default'],
   $rabbit_quorum_queue                     = $facts['os_service_default'],
@@ -413,6 +412,7 @@ class nova(
   $instance_name_template                  = $facts['os_service_default'],
   # DEPRECATED PARAMETERS
   $auth_strategy                           = undef,
+  $rabbit_heartbeat_in_pthread             = undef,
 ) inherits nova::params {
 
   include nova::deps
diff --git a/releasenotes/notes/deprecate-rabbit_heartbeat_in_pthread-213cca7f00274660.yaml b/releasenotes/notes/deprecate-rabbit_heartbeat_in_pthread-213cca7f00274660.yaml
new file mode 100644
index 000000000..25a6037b2
--- /dev/null
+++ b/releasenotes/notes/deprecate-rabbit_heartbeat_in_pthread-213cca7f00274660.yaml
@@ -0,0 +1,5 @@
+---
+deprecations:
+  - |
+    The ``nova::rabbit_heartbeat_in_pthread`` parameter has been deprecated
+    and will be removed in the future release.