diff --git a/manifests/init.pp b/manifests/init.pp
index 6ad182fb..cd9b558b 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -90,6 +90,16 @@
 #   the heartbeat will be checked every 30 seconds. (integer value)
 #   Defaults to $::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 $::os_service_default
+#
 # [*kombu_ssl_ca_certs*]
 #   (optional) SSL certification authority file (valid only if SSL enabled).
 #   (string value)
@@ -276,6 +286,7 @@ class ironic (
   $rabbit_use_ssl                     = $::os_service_default,
   $rabbit_heartbeat_timeout_threshold = $::os_service_default,
   $rabbit_heartbeat_rate              = $::os_service_default,
+  $rabbit_heartbeat_in_pthread        = $::os_service_default,
   $rabbit_ha_queues                   = $::os_service_default,
   $kombu_ssl_ca_certs                 = $::os_service_default,
   $kombu_ssl_certfile                 = $::os_service_default,
@@ -369,6 +380,7 @@ class ironic (
     rabbit_use_ssl              => $rabbit_use_ssl,
     heartbeat_timeout_threshold => $rabbit_heartbeat_timeout_threshold,
     heartbeat_rate              => $rabbit_heartbeat_rate,
+    heartbeat_in_pthread        => $rabbit_heartbeat_in_pthread,
     kombu_reconnect_delay       => $kombu_reconnect_delay,
     kombu_failover_strategy     => $kombu_failover_strategy,
     amqp_durable_queues         => $amqp_durable_queues,
diff --git a/releasenotes/notes/rabbitmq-heartbeat-over-pthread-ad57a77b38c2198a.yaml b/releasenotes/notes/rabbitmq-heartbeat-over-pthread-ad57a77b38c2198a.yaml
new file mode 100644
index 00000000..496d2279
--- /dev/null
+++ b/releasenotes/notes/rabbitmq-heartbeat-over-pthread-ad57a77b38c2198a.yaml
@@ -0,0 +1,6 @@
+---
+features:
+  - |
+    Allow users to run the RabbitMQ heartbeat over a native python thread in the
+    oslo.messaging RabbitMQ driver, by using the `rabbit_heartbeat_in_pthread`
+    option in configuration.
diff --git a/spec/classes/ironic_init_spec.rb b/spec/classes/ironic_init_spec.rb
index ee983978..cff1b5d4 100644
--- a/spec/classes/ironic_init_spec.rb
+++ b/spec/classes/ironic_init_spec.rb
@@ -111,6 +111,7 @@ describe 'ironic' do
       is_expected.to contain_ironic_config('DEFAULT/default_resource_class').with_value('<SERVICE DEFAULT>')
       is_expected.to contain_ironic_config('DEFAULT/notification_level').with_value('<SERVICE DEFAULT>')
       is_expected.to contain_ironic_config('DEFAULT/versioned_notifications_topics').with_value('<SERVICE DEFAULT>')
+      is_expected.to contain_ironic_config('oslo_messaging_rabbit/heartbeat_in_pthread').with_value('<SERVICE DEFAULT>')
     end
   end