openstack/puppet-ironic
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: I082d92c5069257e1f1877f75fd74967786041984
This commit is contained in:
Takashi Kajinami
2025-02-18 10:51:21 +09:00
parent 2addcb8127
commit 40feaba4a9
5 changed files with 36 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
manifests/init.pp
View File

@@ -98,16 +98,6 @@
# the heartbeat will be checked every 30 seconds. (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']
@@ -230,6 +220,18 @@
# for the reserved `service` project.
# Defaults to 'services'
#
# 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 ironic (
Boolean $enabled = true,
$package_ensure = 'present',
@@ -246,7 +248,6 @@ class ironic (
$rabbit_use_ssl = $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'],
$rabbit_ha_queues = $facts['os_service_default'],
$rabbit_quorum_queue = $facts['os_service_default'],
@@ -274,6 +275,8 @@ class ironic (
$versioned_notifications_topics = $facts['os_service_default'],
$rbac_service_role_elevated_access = $facts['os_service_default'],
$rbac_service_project_name = 'services',
# DEPRECATED PARAMETERS
$rabbit_heartbeat_in_pthread = undef,
) {
include ironic::deps

25
manifests/inspector.pp
View File

@@ -238,16 +238,6 @@
# the heartbeat will be checked every 30 seconds. (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']
@@ -323,6 +313,18 @@
# (optional) Whether to run ironic-inspector as a standalone service.
# Defaults to true
#
# 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 ironic::inspector (
$package_ensure = 'present',
Boolean $manage_service = true,
@@ -368,7 +370,6 @@ class ironic::inspector (
$rabbit_use_ssl = $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'],
$rabbit_ha_queues = $facts['os_service_default'],
$rabbit_quorum_queue = $facts['os_service_default'],
@@ -386,6 +387,8 @@ class ironic::inspector (
$kombu_compression = $facts['os_service_default'],
$amqp_durable_queues = $facts['os_service_default'],
Boolean $standalone = true,
# DEPRECATED PARAMETERS
$rabbit_heartbeat_in_pthread = undef,
) inherits ironic::params {
include ironic::deps

6
releasenotes/notes/deprecate-rabbit_heartbeat_in_pthread-dd5e4c41750092a7.yaml Normal file
View File

@@ -0,0 +1,6 @@
---
deprecations:
- |
The ``ironic::rabbit_heartbeat_in_pthread`` parameter and
the ``ironic::inspector::rabbit_heartbeat_in_pthread`` parameter have been
deprecated and will be removed in the future release.

2
spec/classes/ironic_init_spec.rb
View File

@@ -75,7 +75,7 @@ describe 'ironic' do
:rabbit_use_ssl => '<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>',
:kombu_reconnect_delay => '<SERVICE DEFAULT>',
:kombu_failover_strategy => '<SERVICE DEFAULT>',

2
spec/classes/ironic_inspector_spec.rb
View File

@@ -135,7 +135,7 @@ describe 'ironic::inspector' do
:rabbit_use_ssl => '<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>',
:kombu_reconnect_delay => '<SERVICE DEFAULT>',
:kombu_failover_strategy => '<SERVICE DEFAULT>',