Remove support for [oslo_messaging_rabbit] heartbeat_in_pthread
Octavia does not use eventlet so this option has no effect. The option was deprecated as part of community-wide effort to remove eventlet. Change-Id: I895c6402502d221877719d1d541bbed5338c6a24 Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
This commit is contained in:
@@ -174,18 +174,6 @@
|
|||||||
# in the octavia config.
|
# in the octavia config.
|
||||||
# Defaults to false.
|
# Defaults to false.
|
||||||
#
|
#
|
||||||
# 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 octavia (
|
class octavia (
|
||||||
$package_ensure = 'present',
|
$package_ensure = 'present',
|
||||||
$host = $facts['os_service_default'],
|
$host = $facts['os_service_default'],
|
||||||
@@ -222,8 +210,6 @@ class octavia (
|
|||||||
$notification_retry = $facts['os_service_default'],
|
$notification_retry = $facts['os_service_default'],
|
||||||
$topic = 'octavia-rpc',
|
$topic = 'octavia-rpc',
|
||||||
Boolean $purge_config = false,
|
Boolean $purge_config = false,
|
||||||
# DEPRECATED PARAMETERS
|
|
||||||
$rabbit_heartbeat_in_pthread = undef,
|
|
||||||
) inherits octavia::params {
|
) inherits octavia::params {
|
||||||
include octavia::deps
|
include octavia::deps
|
||||||
include octavia::db
|
include octavia::db
|
||||||
@@ -246,7 +232,6 @@ class octavia (
|
|||||||
rabbit_ha_queues => $rabbit_ha_queues,
|
rabbit_ha_queues => $rabbit_ha_queues,
|
||||||
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,
|
||||||
rabbit_use_ssl => $rabbit_use_ssl,
|
rabbit_use_ssl => $rabbit_use_ssl,
|
||||||
kombu_reconnect_delay => $kombu_reconnect_delay,
|
kombu_reconnect_delay => $kombu_reconnect_delay,
|
||||||
|
@@ -0,0 +1,4 @@
|
|||||||
|
---
|
||||||
|
upgrade:
|
||||||
|
- |
|
||||||
|
The ``octavia::rabbit_heartbeat_in_pthread`` parameter has been removed.
|
@@ -38,7 +38,6 @@ describe 'octavia' do
|
|||||||
:rabbit_ha_queues => '<SERVICE DEFAULT>',
|
:rabbit_ha_queues => '<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>',
|
||||||
:rabbit_use_ssl => '<SERVICE DEFAULT>',
|
:rabbit_use_ssl => '<SERVICE DEFAULT>',
|
||||||
:kombu_reconnect_delay => '<SERVICE DEFAULT>',
|
:kombu_reconnect_delay => '<SERVICE DEFAULT>',
|
||||||
@@ -85,7 +84,6 @@ describe 'octavia' do
|
|||||||
:rabbit_ha_queues => true,
|
:rabbit_ha_queues => true,
|
||||||
:rabbit_heartbeat_timeout_threshold => '60',
|
:rabbit_heartbeat_timeout_threshold => '60',
|
||||||
:rabbit_heartbeat_rate => '10',
|
:rabbit_heartbeat_rate => '10',
|
||||||
:rabbit_heartbeat_in_pthread => true,
|
|
||||||
:rabbit_qos_prefetch_count => 0,
|
:rabbit_qos_prefetch_count => 0,
|
||||||
:rabbit_quorum_queue => true,
|
:rabbit_quorum_queue => true,
|
||||||
:rabbit_transient_quorum_queue => true,
|
:rabbit_transient_quorum_queue => true,
|
||||||
@@ -121,7 +119,6 @@ describe 'octavia' do
|
|||||||
:rabbit_ha_queues => true,
|
:rabbit_ha_queues => true,
|
||||||
:heartbeat_timeout_threshold => '60',
|
:heartbeat_timeout_threshold => '60',
|
||||||
:heartbeat_rate => '10',
|
:heartbeat_rate => '10',
|
||||||
:heartbeat_in_pthread => true,
|
|
||||||
:rabbit_qos_prefetch_count => 0,
|
:rabbit_qos_prefetch_count => 0,
|
||||||
:rabbit_use_ssl => '<SERVICE DEFAULT>',
|
:rabbit_use_ssl => '<SERVICE DEFAULT>',
|
||||||
:kombu_reconnect_delay => '5.0',
|
:kombu_reconnect_delay => '5.0',
|
||||||
|
Reference in New Issue
Block a user