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: I7d463a5856b2361dda7a1afa6912f2236528b9f3 Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
This commit is contained in:
@@ -166,18 +166,6 @@
|
||||
# (optional) Datasources types
|
||||
# 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 vitrage (
|
||||
$package_ensure = 'present',
|
||||
$default_transport_url = $facts['os_service_default'],
|
||||
@@ -212,8 +200,6 @@ class vitrage (
|
||||
Boolean $purge_config = false,
|
||||
$snapshots_interval = $facts['os_service_default'],
|
||||
$types = $facts['os_service_default'],
|
||||
# DEPRECATED PARAMETERS
|
||||
$rabbit_heartbeat_in_pthread = undef,
|
||||
) inherits vitrage::params {
|
||||
include vitrage::deps
|
||||
|
||||
@@ -240,7 +226,6 @@ class vitrage (
|
||||
enable_cancel_on_failover => $rabbit_enable_cancel_on_failover,
|
||||
heartbeat_timeout_threshold => $rabbit_heartbeat_timeout_threshold,
|
||||
heartbeat_rate => $rabbit_heartbeat_rate,
|
||||
heartbeat_in_pthread => $rabbit_heartbeat_in_pthread,
|
||||
rabbit_use_ssl => $rabbit_use_ssl,
|
||||
kombu_reconnect_delay => $kombu_reconnect_delay,
|
||||
kombu_failover_strategy => $kombu_failover_strategy,
|
||||
|
@@ -0,0 +1,4 @@
|
||||
---
|
||||
upgrade:
|
||||
- |
|
||||
The ``vitrage::rabbit_heartbeat_in_pthread`` parameter has been removed.
|
@@ -31,7 +31,6 @@ describe 'vitrage' do
|
||||
:rabbit_use_ssl => '<SERVICE DEFAULT>',
|
||||
:heartbeat_timeout_threshold => '<SERVICE DEFAULT>',
|
||||
:heartbeat_rate => '<SERVICE DEFAULT>',
|
||||
:heartbeat_in_pthread => nil,
|
||||
:kombu_reconnect_delay => '<SERVICE DEFAULT>',
|
||||
:kombu_failover_strategy => '<SERVICE DEFAULT>',
|
||||
:amqp_durable_queues => '<SERVICE DEFAULT>',
|
||||
@@ -84,7 +83,6 @@ describe 'vitrage' do
|
||||
:rabbit_transient_queues_ttl => 60,
|
||||
:rabbit_heartbeat_timeout_threshold => '60',
|
||||
:rabbit_heartbeat_rate => '10',
|
||||
:rabbit_heartbeat_in_pthread => true,
|
||||
:kombu_compression => 'gzip',
|
||||
:kombu_reconnect_delay => '5.0',
|
||||
:kombu_failover_strategy => 'shuffle',
|
||||
@@ -110,7 +108,6 @@ describe 'vitrage' do
|
||||
:rabbit_use_ssl => '<SERVICE DEFAULT>',
|
||||
:heartbeat_timeout_threshold => '60',
|
||||
:heartbeat_rate => '10',
|
||||
:heartbeat_in_pthread => true,
|
||||
:kombu_reconnect_delay => '5.0',
|
||||
:kombu_failover_strategy => 'shuffle',
|
||||
:amqp_durable_queues => true,
|
||||
|
Reference in New Issue
Block a user