From fb59d848329954704e418606f9aa2452290f7169 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Wed, 3 Sep 2025 10:35:06 +0900 Subject: [PATCH] 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: I627e348d60ef950269fe877e5b7f7a54bc1f2516 Signed-off-by: Takashi Kajinami --- manifests/init.pp | 12 ------------ ...rabbit_heartbeat_in_pthread-3e2d38d65fefe775.yaml | 4 ++++ spec/classes/neutron_init_spec.rb | 3 --- 3 files changed, 4 insertions(+), 15 deletions(-) create mode 100644 releasenotes/notes/remove-rabbit_heartbeat_in_pthread-3e2d38d65fefe775.yaml diff --git a/manifests/init.pp b/manifests/init.pp index 6244659cb..374895923 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -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, diff --git a/releasenotes/notes/remove-rabbit_heartbeat_in_pthread-3e2d38d65fefe775.yaml b/releasenotes/notes/remove-rabbit_heartbeat_in_pthread-3e2d38d65fefe775.yaml new file mode 100644 index 000000000..a389eddd5 --- /dev/null +++ b/releasenotes/notes/remove-rabbit_heartbeat_in_pthread-3e2d38d65fefe775.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - | + The ``neutron::rabbit_heartbeat_in_pthread`` parameter has been removed. diff --git a/spec/classes/neutron_init_spec.rb b/spec/classes/neutron_init_spec.rb index b3d6a6aef..78ed1b000 100644 --- a/spec/classes/neutron_init_spec.rb +++ b/spec/classes/neutron_init_spec.rb @@ -64,7 +64,6 @@ describe 'neutron' do should contain_oslo__messaging__rabbit('neutron_config').with( :heartbeat_timeout_threshold => '', :heartbeat_rate => '', - :heartbeat_in_pthread => nil, :rabbit_qos_prefetch_count => '', :rabbit_use_ssl => '', :rabbit_transient_queues_ttl => '', @@ -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,