added param support for quorum_cluster_size and target-group-size

Author: alphamonkey79

REFERENCE.md

@@ -277,6 +277,7 @@ The following parameters are available in the `rabbitmq` class:
 * [`package_name`](#-rabbitmq--package_name)
 * [`port`](#-rabbitmq--port)
 * [`python_package`](#-rabbitmq--python_package)
+* [`quorum_cluster_size`](#-rabbitmq--quorum_cluster_size)
 * [`quorum_membership_reconciliation_enabled`](#-rabbitmq--quorum_membership_reconciliation_enabled)
 * [`quorum_membership_reconciliation_auto_remove`](#-rabbitmq--quorum_membership_reconciliation_auto_remove)
 * [`quorum_membership_reconciliation_interval`](#-rabbitmq--quorum_membership_reconciliation_interval)
@@ -845,6 +846,15 @@ Name of the package required by rabbitmqadmin.
 
 Default value: `'python'`
 
+##### <a name="-rabbitmq--quorum_cluster_size"></a>`quorum_cluster_size`
+
+Data type: `Optional[Integer]`
+
+Sets the default quorum queue cluster size.
+More info can be found here: https://www.rabbitmq.com/docs/quorum-queues
+
+Default value: `undef`
+
 ##### <a name="-rabbitmq--quorum_membership_reconciliation_enabled"></a>`quorum_membership_reconciliation_enabled`
 
 Data type: `Optional[Boolean]`

lib/puppet/type/rabbitmq_policy.rb

@@ -13,6 +13,7 @@
   message-ttl
   queue-version
   shards-per-node
+  target-group-size
 ].freeze
 
 Puppet::Type.newtype(:rabbitmq_policy) do

manifests/config.pp

@@ -28,6 +28,7 @@
   $management_ssl                                     = $rabbitmq::management_ssl
   $management_hostname                                = $rabbitmq::management_hostname
   $node_ip_address                                    = $rabbitmq::node_ip_address
+  $quorum_cluster_size                                = $rabbitmq::quorum_cluster_size
   $quorum_membership_reconciliation_enabled           = $rabbitmq::quorum_membership_reconciliation_enabled
   $quorum_membership_reconciliation_auto_remove       = $rabbitmq::quorum_membership_reconciliation_auto_remove
   $quorum_membership_reconciliation_interval          = $rabbitmq::quorum_membership_reconciliation_interval

manifests/init.pp

@@ -260,6 +260,9 @@
 #   The RabbitMQ port.
 # @param python_package
 #   Name of the package required by rabbitmqadmin.
+# @param quorum_cluster_size
+#   Sets the default quorum queue cluster size.
+#   More info can be found here: https://www.rabbitmq.com/docs/quorum-queues
 # @param quorum_membership_reconciliation_enabled
 #   Enables or disables continuous membership reconciliation.
 #   This REQUIRES RabbitMQ 3.13 or higher to be set to true. More information on this configuration
@@ -421,6 +424,7 @@
   Optional[Variant[Numeric, String[1]]] $package_apt_pin                                           = undef,
   String $package_ensure                                                                           = 'installed',
   Optional[String] $package_gpg_key                                                                = undef,
+  Optional[Integer] $quorum_cluster_size                                                           = undef,
   Optional[Boolean] $quorum_membership_reconciliation_enabled                                      = undef,
   Optional[Boolean] $quorum_membership_reconciliation_auto_remove                                  = undef,
   Optional[Integer] $quorum_membership_reconciliation_interval                                     = undef,

spec/classes/rabbitmq_spec.rb

@@ -1817,6 +1817,22 @@
         end
       end
 
+      describe 'quorum_cluster_size with default value' do
+        it 'does not set quorum_cluster_size' do
+          is_expected.to contain_file('rabbitmq.config'). \
+            without_content(%r{quorum_cluster_size, })
+        end
+      end
+
+      describe 'quorum_cluster_size with non-default value' do
+        let(:params) { { quorum_cluster_size: 7 } }
+
+        it 'does set quorum_cluster_size to 7' do
+          is_expected.to contain_file('rabbitmq.config'). \
+            with_content(%r{quorum_cluster_size, 7})
+        end
+      end
+
       # Ensure that whenever Param quorum_membership_reconciliation_enabled is unset - none of the
       # other quorum_membership_reconciliation paramaters are set at all
       # This ensures full backward compatibility with PRE RabbitMQ 3.13

spec/unit/puppet/type/rabbitmq_policy_spec.rb

@@ -234,6 +234,19 @@
     end.to raise_error(Puppet::Error, %r{Invalid queue-version value.*oogabooga})
   end
 
+  it 'accepts and converts the target-group-size value' do
+    definition = { 'target-group-size' => '7' }
+    policy[:definition] = definition
+    expect(policy[:definition]['target-group-size']).to eq(7)
+  end
+
+  it 'does not accept non-numeric target-group-size value' do
+    definition = { 'target-group-size' => 'notreal' }
+    expect do
+      policy[:definition] = definition
+    end.to raise_error(Puppet::Error, %r{Invalid target-group-size value.*notreal})
+  end
+
   context 'accepts list value in ha-params when ha-mode = nodes' do
     before do
       policy[:definition] = definition

templates/rabbitmq.config.epp

@@ -26,6 +26,9 @@
     <%- } -%>
     {cluster_partition_handling, <%= $rabbitmq::config::cluster_partition_handling %>},
 <% } -%>
+<% if $rabbitmq::config::quorum_cluster_size {-%>
+    {quorum_cluster_size, <%= $rabbitmq::config::quorum_cluster_size %>},
+<%- } -%>
 <% if $rabbitmq::config::quorum_membership_reconciliation_enabled {-%>
     {quorum_membership_reconciliation_enabled, <%= $rabbitmq::config::quorum_membership_reconciliation_enabled %>},
   <%- unless $rabbitmq::config::quorum_membership_reconciliation_auto_remove =~ Undef {-%>