Remove support for [oslo_messaging_rabbit] heartbeat_in_pthread

This parameter is no longer used by any other modules we maintain.

Change-Id: I8bcca3f937eed9a25e12b42cdc0c29ee71fe46a9
Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>

manifests/messaging/rabbit.pp

@@ -151,18 +151,6 @@
 #   fanout queues.
 #   Defaults to $facts['os_service_default']
 #
-# DEPRECATED PARAMETERS
-#
-# [*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
-#
 define oslo::messaging::rabbit (
   $amqp_durable_queues                  = $facts['os_service_default'],
   $amqp_auto_delete                     = $facts['os_service_default'],
@@ -194,13 +182,7 @@ define oslo::messaging::rabbit (
   $hostname                             = $facts['os_service_default'],
   $processname                          = $facts['os_service_default'],
   $rabbit_stream_fanout                 = $facts['os_service_default'],
-  # DEPRECATED PARAMETERS
-  $heartbeat_in_pthread                 = undef,
 ) {
-  if $heartbeat_in_pthread != undef {
-    warning('The heartbeat_in_pthread parameter is deprecated.')
-  }
-
   $kombu_ssl_ca_certs_set = (!is_service_default($kombu_ssl_ca_certs) and ($kombu_ssl_ca_certs))
   $kombu_ssl_certfile_set = (!is_service_default($kombu_ssl_certfile) and ($kombu_ssl_certfile))
   $kombu_ssl_keyfile_set  = (!is_service_default($kombu_ssl_keyfile) and ($kombu_ssl_keyfile))
@@ -233,7 +215,6 @@ define oslo::messaging::rabbit (
     'oslo_messaging_rabbit/amqp_durable_queues'                  => { value => $amqp_durable_queues },
     'oslo_messaging_rabbit/amqp_auto_delete'                     => { value => $amqp_auto_delete },
     'oslo_messaging_rabbit/heartbeat_rate'                       => { value => $heartbeat_rate },
-    'oslo_messaging_rabbit/heartbeat_in_pthread'                 => { value => pick($heartbeat_in_pthread, $facts['os_service_default']) },
     'oslo_messaging_rabbit/heartbeat_timeout_threshold'          => { value => $heartbeat_timeout_threshold },
     'oslo_messaging_rabbit/kombu_compression'                    => { value => $kombu_compression },
     'oslo_messaging_rabbit/kombu_failover_strategy'              => { value => $kombu_failover_strategy },

releasenotes/notes/remove-heartbeat_in_pthread-139a3bc4061be256.yaml

@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    The deprecated ``oslo::messaging::rabbit::heartbeat_in_pthread`` parameter
+    has been removed.

spec/defines/oslo_messaging_rabbit_spec.rb

@@ -24,7 +24,6 @@ describe 'oslo::messaging::rabbit' do
         is_expected.to contain_keystone_config('oslo_messaging_rabbit/rabbit_transient_queues_ttl').with_value('<SERVICE DEFAULT>')
         is_expected.to contain_keystone_config('oslo_messaging_rabbit/heartbeat_timeout_threshold').with_value('<SERVICE DEFAULT>')
         is_expected.to contain_keystone_config('oslo_messaging_rabbit/heartbeat_rate').with_value('<SERVICE DEFAULT>')
-        is_expected.to contain_keystone_config('oslo_messaging_rabbit/heartbeat_in_pthread').with_value('<SERVICE DEFAULT>')
         is_expected.to contain_keystone_config('oslo_messaging_rabbit/rabbit_quorum_queue').with_value('<SERVICE DEFAULT>')
         is_expected.to contain_keystone_config('oslo_messaging_rabbit/rabbit_transient_quorum_queue').with_value('<SERVICE DEFAULT>')
         is_expected.to contain_keystone_config('oslo_messaging_rabbit/rabbit_quorum_delivery_limit').with_value('<SERVICE DEFAULT>')
@@ -44,7 +43,6 @@ describe 'oslo::messaging::rabbit' do
           :rabbit_qos_prefetch_count       => 10,
           :heartbeat_timeout_threshold     => 60,
           :heartbeat_rate                  => 10,
-          :heartbeat_in_pthread            => true,
           :kombu_compression               => 'bz2',
           :rabbit_ha_queues                => true,
           :rabbit_quorum_queue             => true,
@@ -64,7 +62,6 @@ describe 'oslo::messaging::rabbit' do
         is_expected.to contain_keystone_config('oslo_messaging_rabbit/rabbit_qos_prefetch_count').with_value(10)
         is_expected.to contain_keystone_config('oslo_messaging_rabbit/heartbeat_timeout_threshold').with_value(60)
         is_expected.to contain_keystone_config('oslo_messaging_rabbit/heartbeat_rate').with_value(10)
-        is_expected.to contain_keystone_config('oslo_messaging_rabbit/heartbeat_in_pthread').with_value(true)
         is_expected.to contain_keystone_config('oslo_messaging_rabbit/kombu_compression').with_value('bz2')
         is_expected.to contain_keystone_config('oslo_messaging_rabbit/rabbit_ha_queues').with_value(true)
         is_expected.to contain_keystone_config('oslo_messaging_rabbit/rabbit_quorum_queue').with_value(true)