From 5056feb41557cb2495ed0c4034df2faddd1ca377 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Sat, 30 Aug 2025 23:38:46 +0900 Subject: [PATCH] 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 --- manifests/init.pp | 15 --------------- ...bit_heartbeat_in_pthread-9200eba5c50995e3.yaml | 4 ++++ spec/classes/octavia_init_spec.rb | 3 --- 3 files changed, 4 insertions(+), 18 deletions(-) create mode 100644 releasenotes/notes/remove-rabbit_heartbeat_in_pthread-9200eba5c50995e3.yaml diff --git a/manifests/init.pp b/manifests/init.pp index 90401bf7..62363a48 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -174,18 +174,6 @@ # in the octavia config. # 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 ( $package_ensure = 'present', $host = $facts['os_service_default'], @@ -222,8 +210,6 @@ class octavia ( $notification_retry = $facts['os_service_default'], $topic = 'octavia-rpc', Boolean $purge_config = false, - # DEPRECATED PARAMETERS - $rabbit_heartbeat_in_pthread = undef, ) inherits octavia::params { include octavia::deps include octavia::db @@ -246,7 +232,6 @@ class octavia ( rabbit_ha_queues => $rabbit_ha_queues, 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, kombu_reconnect_delay => $kombu_reconnect_delay, diff --git a/releasenotes/notes/remove-rabbit_heartbeat_in_pthread-9200eba5c50995e3.yaml b/releasenotes/notes/remove-rabbit_heartbeat_in_pthread-9200eba5c50995e3.yaml new file mode 100644 index 00000000..95c42157 --- /dev/null +++ b/releasenotes/notes/remove-rabbit_heartbeat_in_pthread-9200eba5c50995e3.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - | + The ``octavia::rabbit_heartbeat_in_pthread`` parameter has been removed. diff --git a/spec/classes/octavia_init_spec.rb b/spec/classes/octavia_init_spec.rb index 85a6c5a0..21e96038 100644 --- a/spec/classes/octavia_init_spec.rb +++ b/spec/classes/octavia_init_spec.rb @@ -38,7 +38,6 @@ describe 'octavia' do :rabbit_ha_queues => '', :heartbeat_timeout_threshold => '', :heartbeat_rate => '', - :heartbeat_in_pthread => nil, :rabbit_qos_prefetch_count => '', :rabbit_use_ssl => '', :kombu_reconnect_delay => '', @@ -85,7 +84,6 @@ describe 'octavia' do :rabbit_ha_queues => true, :rabbit_heartbeat_timeout_threshold => '60', :rabbit_heartbeat_rate => '10', - :rabbit_heartbeat_in_pthread => true, :rabbit_qos_prefetch_count => 0, :rabbit_quorum_queue => true, :rabbit_transient_quorum_queue => true, @@ -121,7 +119,6 @@ describe 'octavia' do :rabbit_ha_queues => true, :heartbeat_timeout_threshold => '60', :heartbeat_rate => '10', - :heartbeat_in_pthread => true, :rabbit_qos_prefetch_count => 0, :rabbit_use_ssl => '', :kombu_reconnect_delay => '5.0',