Remove support for [oslo_messaging_rabbit] heartbeat_in_pthread
Barbican no longer uses eventlet so this option has no effect. The option was deprecated as part of community-wide effort to remove eventlet. Change-Id: I753cc920f6d32b22c643a0ea6e352b014bc6ac57 Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
This commit is contained in:
@@ -179,18 +179,6 @@
|
|||||||
# in the cinder config.
|
# in the cinder config.
|
||||||
# Defaults to false.
|
# Defaults to false.
|
||||||
#
|
#
|
||||||
# DEPECATED 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 barbican (
|
class barbican (
|
||||||
$package_ensure = 'present',
|
$package_ensure = 'present',
|
||||||
$default_transport_url = undef,
|
$default_transport_url = undef,
|
||||||
@@ -229,8 +217,6 @@ class barbican (
|
|||||||
$kombu_failover_strategy = $facts['os_service_default'],
|
$kombu_failover_strategy = $facts['os_service_default'],
|
||||||
$kombu_compression = $facts['os_service_default'],
|
$kombu_compression = $facts['os_service_default'],
|
||||||
Boolean $purge_config = false,
|
Boolean $purge_config = false,
|
||||||
# DEPRECATED PARAMETERS
|
|
||||||
$rabbit_heartbeat_in_pthread = undef,
|
|
||||||
) {
|
) {
|
||||||
include barbican::deps
|
include barbican::deps
|
||||||
include barbican::params
|
include barbican::params
|
||||||
@@ -249,7 +235,6 @@ class barbican (
|
|||||||
rabbit_use_ssl => $rabbit_use_ssl,
|
rabbit_use_ssl => $rabbit_use_ssl,
|
||||||
heartbeat_timeout_threshold => $rabbit_heartbeat_timeout_threshold,
|
heartbeat_timeout_threshold => $rabbit_heartbeat_timeout_threshold,
|
||||||
heartbeat_rate => $rabbit_heartbeat_rate,
|
heartbeat_rate => $rabbit_heartbeat_rate,
|
||||||
heartbeat_in_pthread => $rabbit_heartbeat_in_pthread,
|
|
||||||
rabbit_qos_prefetch_count => $rabbit_qos_prefetch_count,
|
rabbit_qos_prefetch_count => $rabbit_qos_prefetch_count,
|
||||||
kombu_reconnect_delay => $kombu_reconnect_delay,
|
kombu_reconnect_delay => $kombu_reconnect_delay,
|
||||||
kombu_failover_strategy => $kombu_failover_strategy,
|
kombu_failover_strategy => $kombu_failover_strategy,
|
||||||
|
@@ -0,0 +1,4 @@
|
|||||||
|
---
|
||||||
|
upgrade:
|
||||||
|
- |
|
||||||
|
The ``barbican::rabbit_heartbeat_in_pthread`` parameter has been removed.
|
@@ -49,7 +49,6 @@ describe 'barbican' do
|
|||||||
:rabbit_use_ssl => '<SERVICE DEFAULT>',
|
:rabbit_use_ssl => '<SERVICE DEFAULT>',
|
||||||
:heartbeat_timeout_threshold => '<SERVICE DEFAULT>',
|
:heartbeat_timeout_threshold => '<SERVICE DEFAULT>',
|
||||||
:heartbeat_rate => '<SERVICE DEFAULT>',
|
:heartbeat_rate => '<SERVICE DEFAULT>',
|
||||||
:heartbeat_in_pthread => nil,
|
|
||||||
:rabbit_qos_prefetch_count => '<SERVICE DEFAULT>',
|
:rabbit_qos_prefetch_count => '<SERVICE DEFAULT>',
|
||||||
:kombu_reconnect_delay => '<SERVICE DEFAULT>',
|
:kombu_reconnect_delay => '<SERVICE DEFAULT>',
|
||||||
:kombu_failover_strategy => '<SERVICE DEFAULT>',
|
:kombu_failover_strategy => '<SERVICE DEFAULT>',
|
||||||
@@ -85,7 +84,6 @@ describe 'barbican' do
|
|||||||
:rabbit_use_ssl => true,
|
:rabbit_use_ssl => true,
|
||||||
:rabbit_heartbeat_timeout_threshold => '10',
|
:rabbit_heartbeat_timeout_threshold => '10',
|
||||||
:rabbit_heartbeat_rate => '10',
|
:rabbit_heartbeat_rate => '10',
|
||||||
:rabbit_heartbeat_in_pthread => true,
|
|
||||||
:rabbit_qos_prefetch_count => 0,
|
:rabbit_qos_prefetch_count => 0,
|
||||||
:rabbit_ha_queues => true,
|
:rabbit_ha_queues => true,
|
||||||
:rabbit_quorum_queue => true,
|
:rabbit_quorum_queue => true,
|
||||||
@@ -138,7 +136,6 @@ describe 'barbican' do
|
|||||||
:rabbit_use_ssl => params[:rabbit_use_ssl],
|
:rabbit_use_ssl => params[:rabbit_use_ssl],
|
||||||
:heartbeat_timeout_threshold => params[:rabbit_heartbeat_timeout_threshold],
|
:heartbeat_timeout_threshold => params[:rabbit_heartbeat_timeout_threshold],
|
||||||
:heartbeat_rate => params[:rabbit_heartbeat_rate],
|
:heartbeat_rate => params[:rabbit_heartbeat_rate],
|
||||||
:heartbeat_in_pthread => params[:rabbit_heartbeat_in_pthread],
|
|
||||||
:rabbit_qos_prefetch_count => params[:rabbit_qos_prefetch_count],
|
:rabbit_qos_prefetch_count => params[:rabbit_qos_prefetch_count],
|
||||||
:kombu_reconnect_delay => params[:kombu_reconnect_delay],
|
:kombu_reconnect_delay => params[:kombu_reconnect_delay],
|
||||||
:kombu_failover_strategy => params[:kombu_failover_strategy],
|
:kombu_failover_strategy => params[:kombu_failover_strategy],
|
||||||
|
Reference in New Issue
Block a user