diff --git a/manifests/proxy/ceilometer.pp b/manifests/proxy/ceilometer.pp
index 0da10ab0..1324bf81 100644
--- a/manifests/proxy/ceilometer.pp
+++ b/manifests/proxy/ceilometer.pp
@@ -110,16 +110,6 @@
 #   we check the heartbeat. (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']
@@ -151,6 +141,16 @@
 #   (Optional) Password for decrypting ssl_key_file (if encrypted)
 #   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
+#
 # == Examples
 #
 # == Authors
@@ -186,14 +186,14 @@ class swift::proxy::ceilometer(
   $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'],
   $amqp_durable_queues                = $facts['os_service_default'],
   $kombu_reconnect_delay              = $facts['os_service_default'],
   $kombu_failover_strategy            = $facts['os_service_default'],
   $kombu_compression                  = $facts['os_service_default'],
   # DEPRECATED PARAMETERS
-  $amqp_ssl_key_password              = undef
+  $amqp_ssl_key_password              = undef,
+  $rabbit_heartbeat_in_pthread        = undef,
 ) inherits swift {
 
   include swift::deps
diff --git a/releasenotes/notes/deprecate-rabbit_heartbeat_in_pthread-0ec47c8c9ca82696.yaml b/releasenotes/notes/deprecate-rabbit_heartbeat_in_pthread-0ec47c8c9ca82696.yaml
new file mode 100644
index 00000000..50e7c46f
--- /dev/null
+++ b/releasenotes/notes/deprecate-rabbit_heartbeat_in_pthread-0ec47c8c9ca82696.yaml
@@ -0,0 +1,5 @@
+---
+deprecations:
+  - |
+    The ``swift::proxy::ceilometer::rabbit_heartbeat_in_pthread`` parameter has
+    been deprecated and will be removed in the future release.
diff --git a/spec/classes/swift_proxy_ceilometer_spec.rb b/spec/classes/swift_proxy_ceilometer_spec.rb
index 3c502f19..5249f483 100644
--- a/spec/classes/swift_proxy_ceilometer_spec.rb
+++ b/spec/classes/swift_proxy_ceilometer_spec.rb
@@ -81,7 +81,7 @@ describe 'swift::proxy::ceilometer' do
         :rabbit_ha_queues            => '<SERVICE DEFAULT>',
         :heartbeat_timeout_threshold => '<SERVICE DEFAULT>',
         :heartbeat_rate              => '<SERVICE DEFAULT>',
-        :heartbeat_in_pthread        => '<SERVICE DEFAULT>',
+        :heartbeat_in_pthread        => nil,
         :rabbit_qos_prefetch_count   => '<SERVICE DEFAULT>',
         :amqp_durable_queues         => '<SERVICE DEFAULT>',
         :kombu_ssl_ca_certs          => '<SERVICE DEFAULT>',