Remove support for [oslo_messaging_rabbit] heartbeat_in_pthread
Ironic not longer uses eventlet so this option has no effect. The option was deprecated as part of community-wide effort to remove eventlet. Change-Id: I998a398283f32ddd30c9e729d979ef4addfc0419 Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
This commit is contained in:
@@ -240,18 +240,6 @@
|
||||
# for the reserved `service` project.
|
||||
# Defaults to 'services'
|
||||
#
|
||||
# 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 ironic (
|
||||
Boolean $enabled = true,
|
||||
$package_ensure = 'present',
|
||||
@@ -299,8 +287,6 @@ class ironic (
|
||||
$versioned_notifications_topics = $facts['os_service_default'],
|
||||
$rbac_service_role_elevated_access = $facts['os_service_default'],
|
||||
$rbac_service_project_name = 'services',
|
||||
# DEPRECATED PARAMETERS
|
||||
$rabbit_heartbeat_in_pthread = undef,
|
||||
) {
|
||||
include ironic::deps
|
||||
include ironic::db
|
||||
@@ -351,7 +337,6 @@ class ironic (
|
||||
rabbit_use_ssl => $rabbit_use_ssl,
|
||||
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,
|
||||
kombu_reconnect_delay => $kombu_reconnect_delay,
|
||||
kombu_failover_strategy => $kombu_failover_strategy,
|
||||
|
@@ -0,0 +1,4 @@
|
||||
---
|
||||
upgrade:
|
||||
- |
|
||||
The ``ironic::rabbit_heartbeat_in_pthread`` parameter has been removed.
|
@@ -75,7 +75,6 @@ describe 'ironic' 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>',
|
||||
@@ -122,7 +121,6 @@ describe 'ironic' do
|
||||
:rabbit_use_ssl => true,
|
||||
:rabbit_heartbeat_timeout_threshold => '60',
|
||||
:rabbit_heartbeat_rate => '10',
|
||||
:rabbit_heartbeat_in_pthread => true,
|
||||
:rabbit_qos_prefetch_count => 0,
|
||||
:kombu_reconnect_delay => '5.0',
|
||||
:amqp_durable_queues => true,
|
||||
@@ -172,7 +170,6 @@ describe 'ironic' do
|
||||
:rabbit_use_ssl => true,
|
||||
:heartbeat_timeout_threshold => '60',
|
||||
:heartbeat_rate => '10',
|
||||
:heartbeat_in_pthread => true,
|
||||
:rabbit_qos_prefetch_count => 0,
|
||||
:kombu_reconnect_delay => '5.0',
|
||||
:amqp_durable_queues => true,
|
||||
|
Reference in New Issue
Block a user