openstack/puppet-swift
Code Issues Proposed changes

Deprecate support for [oslo_messaging_rabbit] heartbeat_in_pthread

Browse Source 
... because the option has been deprecated.

Note that the deprecation warning may be added in puppet-oslo so is not
implemented in individual module.

Depends-on: https://review.opendev.org/925778
Change-Id: Ibab11aff6c0fede46d53fc36c93238c6138d45e0
This commit is contained in:
Takashi Kajinami 2025-02-18 11:47:08 +09:00
parent b7fbe8740c
commit 88d364c885
3 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
manifests/proxy/ceilometer.pp
View File

@ -110,16 +110,6 @@
# we check the heartbeat. (integer value)
# Defaults to $facts['os_service_default']
#
# [*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 $facts['os_service_default']
#
# [*rabbit_qos_prefetch_count*]
# (Optional) Specifies the number of messages to prefetch.
# Defaults to $facts['os_service_default']
@ -151,6 +141,16 @@
# (Optional) Password for decrypting ssl_key_file (if encrypted)
# Defaults to undef
#
# [*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
#
# == Examples
#
# == Authors
@ -186,14 +186,14 @@ class swift::proxy::ceilometer(
$rabbit_ha_queues = $facts['os_service_default'],
$rabbit_heartbeat_timeout_threshold = $facts['os_service_default'],
$rabbit_heartbeat_rate = $facts['os_service_default'],
$rabbit_heartbeat_in_pthread = $facts['os_service_default'],
$rabbit_qos_prefetch_count = $facts['os_service_default'],
$amqp_durable_queues = $facts['os_service_default'],
$kombu_reconnect_delay = $facts['os_service_default'],
$kombu_failover_strategy = $facts['os_service_default'],
$kombu_compression = $facts['os_service_default'],
# DEPRECATED PARAMETERS
$amqp_ssl_key_password = undef
$amqp_ssl_key_password = undef,
$rabbit_heartbeat_in_pthread = undef,
) inherits swift {
include swift::deps

5
releasenotes/notes/deprecate-rabbit_heartbeat_in_pthread-0ec47c8c9ca82696.yaml Normal file
View File

@ -0,0 +1,5 @@
---
deprecations:
- |
The ``swift::proxy::ceilometer::rabbit_heartbeat_in_pthread`` parameter has
been deprecated and will be removed in the future release.

2
spec/classes/swift_proxy_ceilometer_spec.rb
View File

@ -81,7 +81,7 @@ describe 'swift::proxy::ceilometer' do
:rabbit_ha_queues => '<SERVICE DEFAULT>',
:heartbeat_timeout_threshold => '<SERVICE DEFAULT>',
:heartbeat_rate => '<SERVICE DEFAULT>',
:heartbeat_in_pthread => '<SERVICE DEFAULT>',
:heartbeat_in_pthread => nil,
:rabbit_qos_prefetch_count => '<SERVICE DEFAULT>',
:amqp_durable_queues => '<SERVICE DEFAULT>',
:kombu_ssl_ca_certs => '<SERVICE DEFAULT>',