diff --git a/manifests/init.pp b/manifests/init.pp
index 79abfea..0f941ab 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -31,6 +31,16 @@
 #   every 30 seconds.
 #   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
+#
 # [*rabbit_use_ssl*]
 #   (Optional) Connect over SSL for RabbitMQ.
 #   Defaults to $::os_service_default.
@@ -247,6 +257,7 @@ class cloudkitty(
   $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,
@@ -315,6 +326,7 @@ class cloudkitty(
     amqp_durable_queues         => $amqp_durable_queues,
     heartbeat_timeout_threshold => $rabbit_heartbeat_timeout_threshold,
     heartbeat_rate              => $rabbit_heartbeat_rate,
+    heartbeat_in_pthread        => $rabbit_heartbeat_in_pthread,
     kombu_ssl_version           => $kombu_ssl_version,
     kombu_ssl_keyfile           => $kombu_ssl_keyfile,
     kombu_ssl_certfile          => $kombu_ssl_certfile,
diff --git a/releasenotes/notes/rabbitmq-heartbeat-over-pthread-9473d46d4c2212ad.yaml b/releasenotes/notes/rabbitmq-heartbeat-over-pthread-9473d46d4c2212ad.yaml
new file mode 100644
index 0000000..496d227
--- /dev/null
+++ b/releasenotes/notes/rabbitmq-heartbeat-over-pthread-9473d46d4c2212ad.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/cloudkitty_init_spec.rb b/spec/classes/cloudkitty_init_spec.rb
index 9f79ed2..30029d5 100644
--- a/spec/classes/cloudkitty_init_spec.rb
+++ b/spec/classes/cloudkitty_init_spec.rb
@@ -27,6 +27,7 @@ describe 'cloudkitty' do
         is_expected.to contain_cloudkitty_config('DEFAULT/control_exchange').with_value('<SERVICE DEFAULT>')
         is_expected.to contain_cloudkitty_config('oslo_messaging_rabbit/heartbeat_timeout_threshold').with_value('<SERVICE DEFAULT>')
         is_expected.to contain_cloudkitty_config('oslo_messaging_rabbit/heartbeat_rate').with_value('<SERVICE DEFAULT>')
+        is_expected.to contain_cloudkitty_config('oslo_messaging_rabbit/heartbeat_in_pthread').with_value('<SERVICE DEFAULT>')
         is_expected.to contain_cloudkitty_config('oslo_messaging_rabbit/kombu_compression').with_value('<SERVICE DEFAULT>')
         is_expected.to contain_cloudkitty_config('oslo_messaging_notifications/transport_url').with_value('<SERVICE DEFAULT>')
         is_expected.to contain_cloudkitty_config('oslo_messaging_notifications/driver').with_value('<SERVICE DEFAULT>')
@@ -48,6 +49,7 @@ describe 'cloudkitty' do
           :rabbit_ha_queues                   => 'undef',
           :rabbit_heartbeat_timeout_threshold => '60',
           :rabbit_heartbeat_rate              => '10',
+          :rabbit_heartbeat_in_pthread        => true,
           :kombu_compression                  => 'gzip',
           :package_ensure                     => '2012.1.1-15.el6',
           :notification_topics                => 'openstack',
@@ -67,6 +69,7 @@ describe 'cloudkitty' do
         is_expected.to contain_cloudkitty_config('DEFAULT/control_exchange').with_value('cloudkitty')
         is_expected.to contain_cloudkitty_config('oslo_messaging_rabbit/heartbeat_timeout_threshold').with_value('60')
         is_expected.to contain_cloudkitty_config('oslo_messaging_rabbit/heartbeat_rate').with_value('10')
+        is_expected.to contain_cloudkitty_config('oslo_messaging_rabbit/heartbeat_in_pthread').with_value(true)
         is_expected.to contain_cloudkitty_config('oslo_messaging_rabbit/kombu_compression').with_value('gzip')
       end