Remove support for [oslo_messaging_rabbit] heartbeat_in_pthread
This feature is known to break services using eventlet and is highly discouraged now. Change-Id: Id3f452dfcc98958ccb430637efecdd6a88b9dfcb Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
This commit is contained in:
@@ -193,18 +193,6 @@
|
||||
# heartbeat.
|
||||
# Defaults to $facts['os_service_default']
|
||||
#
|
||||
# DEPRECATED PARAMETERS
|
||||
#
|
||||
# [*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 mistral (
|
||||
$package_ensure = 'present',
|
||||
$os_actions_endpoint_type = $facts['os_service_default'],
|
||||
@@ -243,8 +231,6 @@ class mistral (
|
||||
$max_missed_heartbeats = $facts['os_service_default'],
|
||||
$check_interval = $facts['os_service_default'],
|
||||
$first_heartbeat_timeout = $facts['os_service_default'],
|
||||
# DEPRECATED PARAMETERS
|
||||
$rabbit_heartbeat_in_pthread = undef,
|
||||
) {
|
||||
include mistral::deps
|
||||
include mistral::params
|
||||
@@ -292,7 +278,6 @@ class mistral (
|
||||
kombu_reconnect_delay => $kombu_reconnect_delay,
|
||||
heartbeat_timeout_threshold => $rabbit_heartbeat_timeout_threshold,
|
||||
heartbeat_rate => $rabbit_heartbeat_rate,
|
||||
heartbeat_in_pthread => $rabbit_heartbeat_in_pthread,
|
||||
rabbit_qos_prefetch_count => $rabbit_qos_prefetch_count,
|
||||
amqp_durable_queues => $amqp_durable_queues,
|
||||
amqp_auto_delete => $amqp_auto_delete,
|
||||
|
||||
@@ -0,0 +1,4 @@
|
||||
---
|
||||
upgrade:
|
||||
- |
|
||||
The ``mistral::rabbit_heartbeat_in_pthread`` parameter has been removed.
|
||||
@@ -41,7 +41,6 @@ describe 'mistral' do
|
||||
:rabbit_use_ssl => '<SERVICE DEFAULT>',
|
||||
:heartbeat_timeout_threshold => '<SERVICE DEFAULT>',
|
||||
:heartbeat_rate => '<SERVICE DEFAULT>',
|
||||
:heartbeat_in_pthread => nil,
|
||||
:rabbit_qos_prefetch_count => '<SERVICE DEFAULT>',
|
||||
:kombu_reconnect_delay => '<SERVICE DEFAULT>',
|
||||
:kombu_failover_strategy => '<SERVICE DEFAULT>',
|
||||
@@ -115,7 +114,6 @@ describe 'mistral' do
|
||||
req_params.merge({
|
||||
:rabbit_heartbeat_timeout_threshold => '60',
|
||||
:rabbit_heartbeat_rate => '10',
|
||||
:rabbit_heartbeat_in_pthread => true
|
||||
})
|
||||
end
|
||||
|
||||
@@ -123,7 +121,6 @@ describe 'mistral' do
|
||||
is_expected.to contain_oslo__messaging__rabbit('mistral_config').with(
|
||||
:heartbeat_timeout_threshold => '60',
|
||||
:heartbeat_rate => '10',
|
||||
:heartbeat_in_pthread => true,
|
||||
)
|
||||
end
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user