From 9e06944866058e9f3e46be4c43df4d096b36cdd7 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Sat, 30 Aug 2025 23:37:25 +0900 Subject: [PATCH] Remove support for [oslo_messaging_rabbit] heartbeat_in_pthread Keystone 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: Id28a75c8454d5019076327049f482297317253c0 Signed-off-by: Takashi Kajinami --- manifests/init.pp | 13 ------------- ...abbit_heartbeat_in_pthread-3b12a812f1d2e1fd.yaml | 4 ++++ spec/classes/keystone_init_spec.rb | 1 - 3 files changed, 4 insertions(+), 14 deletions(-) create mode 100644 releasenotes/notes/remove-rabbit_heartbeat_in_pthread-3b12a812f1d2e1fd.yaml diff --git a/manifests/init.pp b/manifests/init.pp index 9f6125190..cd6eaaab2 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -378,16 +378,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 -# # == Authors # # Dan Bode dan@puppetlabs.com @@ -466,8 +456,6 @@ class keystone ( Boolean $purge_config = false, $amqp_durable_queues = $facts['os_service_default'], $amqp_auto_delete = $facts['os_service_default'], - # DEPRECATED PARAMETERS - $rabbit_heartbeat_in_pthread = undef, ) inherits keystone::params { include keystone::deps include keystone::logging @@ -572,7 +560,6 @@ class keystone ( 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, amqp_durable_queues => $amqp_durable_queues, amqp_auto_delete => $amqp_auto_delete, diff --git a/releasenotes/notes/remove-rabbit_heartbeat_in_pthread-3b12a812f1d2e1fd.yaml b/releasenotes/notes/remove-rabbit_heartbeat_in_pthread-3b12a812f1d2e1fd.yaml new file mode 100644 index 000000000..1aa05ed5b --- /dev/null +++ b/releasenotes/notes/remove-rabbit_heartbeat_in_pthread-3b12a812f1d2e1fd.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - | + The ``keystone::rabbit_heartbeat_in_pthread`` parameter has been removed. diff --git a/spec/classes/keystone_init_spec.rb b/spec/classes/keystone_init_spec.rb index 67277e501..093c49475 100644 --- a/spec/classes/keystone_init_spec.rb +++ b/spec/classes/keystone_init_spec.rb @@ -79,7 +79,6 @@ describe 'keystone' do :rabbit_ha_queues => '', :heartbeat_timeout_threshold => '', :heartbeat_rate => '', - :heartbeat_in_pthread => nil, :rabbit_qos_prefetch_count => '', :amqp_durable_queues => '', :amqp_auto_delete => '',