From 37398d7f96db564008182ec9288e9aba0a551f81 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Wed, 18 Sep 2024 23:19:54 +0900
Subject: [PATCH] Expose rabbit_qos_prefetch_count

The option was supported by puppet-oslo but was not configurable via
this module.

Change-Id: Ib5af448ebf08136f9c9bcaf7d72ce0245456cdde
---
 manifests/guestagent.pp                                     | 1 +
 manifests/init.pp                                           | 6 ++++++
 .../notes/rabbit_qos_prefetch_count-92ac029d5c8ce265.yaml   | 4 ++++
 spec/classes/trove_guestagent_spec.rb                       | 1 +
 spec/classes/trove_init_spec.rb                             | 1 +
 5 files changed, 13 insertions(+)
 create mode 100644 releasenotes/notes/rabbit_qos_prefetch_count-92ac029d5c8ce265.yaml

diff --git a/manifests/guestagent.pp b/manifests/guestagent.pp
index 943fe4a4..7703c7fe 100644
--- a/manifests/guestagent.pp
+++ b/manifests/guestagent.pp
@@ -173,6 +173,7 @@ class trove::guestagent(
     heartbeat_timeout_threshold     => $::trove::rabbit_heartbeat_timeout_threshold,
     heartbeat_rate                  => $::trove::rabbit_heartbeat_rate,
     heartbeat_in_pthread            => $::trove::rabbit_heartbeat_in_pthread,
+    rabbit_qos_prefetch_count       => $::trove::rabbit_qos_prefetch_count,
     rabbit_use_ssl                  => $rabbit_use_ssl,
     kombu_reconnect_delay           => $::trove::kombu_reconnect_delay,
     kombu_failover_strategy         => $::trove::kombu_failover_strategy,
diff --git a/manifests/init.pp b/manifests/init.pp
index b45e15a1..c990633c 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -98,6 +98,10 @@
 #   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']
+#
 # [*rabbit_quorum_queue*]
 #   (Optional) Use quorum queues in RabbitMQ.
 #   Defaults to $facts['os_service_default']
@@ -242,6 +246,7 @@ class trove(
   $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_quorum_queue                = $facts['os_service_default'],
   $rabbit_transient_quorum_queue      = $facts['os_service_default'],
   $rabbit_quorum_delivery_limit       = $facts['os_service_default'],
@@ -350,6 +355,7 @@ class trove(
     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,
     kombu_failover_strategy         => $kombu_failover_strategy,
diff --git a/releasenotes/notes/rabbit_qos_prefetch_count-92ac029d5c8ce265.yaml b/releasenotes/notes/rabbit_qos_prefetch_count-92ac029d5c8ce265.yaml
new file mode 100644
index 00000000..9caa8b3e
--- /dev/null
+++ b/releasenotes/notes/rabbit_qos_prefetch_count-92ac029d5c8ce265.yaml
@@ -0,0 +1,4 @@
+---
+features:
+  - |
+    The new ``trove::rabbit_qos_prefetch_count`` parameter has been added.
diff --git a/spec/classes/trove_guestagent_spec.rb b/spec/classes/trove_guestagent_spec.rb
index 8b6c8155..076cf7a1 100644
--- a/spec/classes/trove_guestagent_spec.rb
+++ b/spec/classes/trove_guestagent_spec.rb
@@ -50,6 +50,7 @@ describe 'trove::guestagent' do
           :heartbeat_timeout_threshold     => '<SERVICE DEFAULT>',
           :heartbeat_rate                  => '<SERVICE DEFAULT>',
           :heartbeat_in_pthread            => '<SERVICE DEFAULT>',
+          :rabbit_qos_prefetch_count       => '<SERVICE DEFAULT>',
           :rabbit_use_ssl                  => '<SERVICE DEFAULT>',
           :kombu_reconnect_delay           => '<SERVICE DEFAULT>',
           :kombu_failover_strategy         => '<SERVICE DEFAULT>',
diff --git a/spec/classes/trove_init_spec.rb b/spec/classes/trove_init_spec.rb
index 6f019457..19b45209 100644
--- a/spec/classes/trove_init_spec.rb
+++ b/spec/classes/trove_init_spec.rb
@@ -58,6 +58,7 @@ describe 'trove' do
           :heartbeat_timeout_threshold     => '<SERVICE DEFAULT>',
           :heartbeat_rate                  => '<SERVICE DEFAULT>',
           :heartbeat_in_pthread            => '<SERVICE DEFAULT>',
+          :rabbit_qos_prefetch_count       => '<SERVICE DEFAULT>',
           :rabbit_use_ssl                  => '<SERVICE DEFAULT>',
           :kombu_reconnect_delay           => '<SERVICE DEFAULT>',
           :kombu_failover_strategy         => '<SERVICE DEFAULT>',