openstack/puppet-neutron
Code Issues Proposed changes

Deprecate support for [oslo_messaging_rabbit] heartbeat_in_pthread

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

Depends-on: https://review.opendev.org/925778
Change-Id: Ife00351446e7e93f83973741f612db2152ba7348
This commit is contained in:
Takashi Kajinami
2025-02-18 10:58:34 +09:00
parent 9cc1dbf5bc
commit fd22380797
2 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
manifests/init.pp
View File

@@ -123,16 +123,6 @@
# every 30 seconds. # every 30 seconds.
# Defaults to $facts['os_service_default'] # 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*] # [*rabbit_qos_prefetch_count*]
# (Optional) Specifies the number of messages to prefetch. # (Optional) Specifies the number of messages to prefetch.
# Defaults to $facts['os_service_default'] # Defaults to $facts['os_service_default']
@@ -287,6 +277,18 @@
# networks using 0x8a88 ethertype. # networks using 0x8a88 ethertype.
# Defaults to $facts['os_service_default']. # Defaults to $facts['os_service_default'].
# #
# 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 neutron ( class neutron (
$package_ensure = 'present', $package_ensure = 'present',
$bind_host = $facts['os_service_default'], $bind_host = $facts['os_service_default'],
@@ -313,7 +315,6 @@ class neutron (
$rabbit_ha_queues = $facts['os_service_default'], $rabbit_ha_queues = $facts['os_service_default'],
$rabbit_heartbeat_timeout_threshold = $facts['os_service_default'], $rabbit_heartbeat_timeout_threshold = $facts['os_service_default'],
$rabbit_heartbeat_rate = $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'], $rabbit_qos_prefetch_count = $facts['os_service_default'],
$rabbit_quorum_queue = $facts['os_service_default'], $rabbit_quorum_queue = $facts['os_service_default'],
$rabbit_transient_quorum_queue = $facts['os_service_default'], $rabbit_transient_quorum_queue = $facts['os_service_default'],
@@ -346,6 +347,8 @@ class neutron (
$max_allowed_address_pair = $facts['os_service_default'], $max_allowed_address_pair = $facts['os_service_default'],
$vlan_transparent = $facts['os_service_default'], $vlan_transparent = $facts['os_service_default'],
$vlan_qinq = $facts['os_service_default'], $vlan_qinq = $facts['os_service_default'],
# DEPRECATED PARAMETERS
$rabbit_heartbeat_in_pthread = undef,
) { ) {
include neutron::deps include neutron::deps

5
releasenotes/notes/deprecate-rabbit_heartbeat_in_pthread-0430fd49b1ef2824.yaml Normal file
View File

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