openstack/puppet-neutron
Code Issues Proposed changes

Remove support for [oslo_messaging_rabbit] heartbeat_in_pthread

Browse Source 
This feature is known to break services using eventlet and is highly
discouraged now.

Change-Id: I627e348d60ef950269fe877e5b7f7a54bc1f2516
Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
This commit is contained in:
Takashi Kajinami
2025-09-03 10:35:06 +09:00
parent 618e856808
commit fb59d84832
3 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
manifests/init.pp
View File

@@ -281,16 +281,6 @@
#
# 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
#
# [*vlan_transparent*]
# (optional) Allow plugins that support it to create VLAN transparent
# networks.
@@ -361,7 +351,6 @@ class neutron (
$notification_retry = $facts['os_service_default'],
$max_allowed_address_pair = $facts['os_service_default'],
# DEPRECATED PARAMETERS
$rabbit_heartbeat_in_pthread = undef,
$vlan_transparent = undef,
$vlan_qinq = undef,
) {
@@ -442,7 +431,6 @@ will be removed in a future release")
oslo::messaging::rabbit { 'neutron_config':
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,
rabbit_use_ssl => $rabbit_use_ssl,
rabbit_transient_queues_ttl => $rabbit_transient_queues_ttl,

4
releasenotes/notes/remove-rabbit_heartbeat_in_pthread-3e2d38d65fefe775.yaml Normal file
View File

@@ -0,0 +1,4 @@
---
upgrade:
- |
The ``neutron::rabbit_heartbeat_in_pthread`` parameter has been removed.

3
spec/classes/neutron_init_spec.rb
View File

@@ -64,7 +64,6 @@ describe 'neutron' do
should contain_oslo__messaging__rabbit('neutron_config').with(
:heartbeat_timeout_threshold => '<SERVICE DEFAULT>',
:heartbeat_rate => '<SERVICE DEFAULT>',
:heartbeat_in_pthread => nil,
:rabbit_qos_prefetch_count => '<SERVICE DEFAULT>',
:rabbit_use_ssl => '<SERVICE DEFAULT>',
:rabbit_transient_queues_ttl => '<SERVICE DEFAULT>',
@@ -125,7 +124,6 @@ describe 'neutron' do
params.merge!(
:rabbit_heartbeat_timeout_threshold => 60,
:rabbit_heartbeat_rate => 10,
:rabbit_heartbeat_in_pthread => true,
:amqp_durable_queues => true,
:rabbit_ha_queues => true,
:rabbit_transient_queues_ttl => 20,
@@ -136,7 +134,6 @@ describe 'neutron' do
should contain_oslo__messaging__rabbit('neutron_config').with(
:heartbeat_timeout_threshold => 60,
:heartbeat_rate => 10,
:heartbeat_in_pthread => true,
:amqp_durable_queues => true,
:rabbit_ha_queues => true,
:rabbit_transient_queues_ttl => 20,