additional fixes and tweaks per github conversation!

Author: LangJV

REFERENCE.md

@@ -808,8 +808,8 @@ Default value: `'python'`
 
 Data type: `Optional[Boolean]`
 
-Boolean - Enables or disables continuous membership reconciliation.
-This requires RabbitMQ 3.13 or higher. More information on this configuration
+Enables or disables continuous membership reconciliation.
+This REQUIRES RabbitMQ 3.13 or higher to be set to true. More information on this configuration
 can be found here: https://www.rabbitmq.com/docs/quorum-queues
 
 Default value: `undef`
@@ -818,9 +818,8 @@ Default value: `undef`
 
 Data type: `Optional[Boolean]`
 
-Boolean - Enables or disables automatic removal of member nodes that are no longer part of the cluster,
-but still a member of the quorum queue. This requires RabbitMQ 3.13 or higher. More information on this configuration
-can be found here: https://www.rabbitmq.com/docs/quorum-queues
+Enables or disables automatic removal of member nodes that are no longer part of the cluster,
+but still a member of the quorum queue.
 Important Note: This only takes affect if quorum_membership_reconciliation_enabled is set to true.
 
 Default value: `undef`
@@ -829,8 +828,7 @@ Default value: `undef`
 
 Data type: `Optional[Integer]`
 
-Integer - The default evaluation interval in milliseconds. This requires RabbitMQ 3.13 or higher. More information on this configuration
-can be found here: https://www.rabbitmq.com/docs/quorum-queues
+The default evaluation interval in milliseconds.
 Important Note: This only takes affect if quorum_membership_reconciliation_enabled is set to true.
 
 Default value: `undef`
@@ -839,11 +837,9 @@ Default value: `undef`
 
 Data type: `Optional[Integer]`
 
-Integer - The reconciliation delay in milliseconds, used when a trigger event occurs,
+The reconciliation delay in milliseconds, used when a trigger event occurs,
 for example, a node is added or removed from the cluster or an applicable policy changes.
 This delay will be applied only once, then the regular interval will be used again.
-This requires RabbitMQ 3.13 or higher. More information on this configuration
-can be found here: https://www.rabbitmq.com/docs/quorum-queues
 Important Note: This only takes affect if quorum_membership_reconciliation_enabled is set to true.
 
 Default value: `undef`
@@ -852,9 +848,7 @@ Default value: `undef`
 
 Data type: `Optional[Integer]`
 
-Integer - Controls the target group size for a quorum queue
-This requires RabbitMQ 3.13 or higher. More information on this configuration
-can be found here: https://www.rabbitmq.com/docs/quorum-queues
+Controls the target group size for a quorum queue
 Important Note: This only takes affect if quorum_membership_reconciliation_enabled is set to true.
 
 Default value: `undef`

manifests/init.pp

@@ -241,29 +241,23 @@
 # @param python_package
 #   Name of the package required by rabbitmqadmin.
 # @param quorum_membership_reconciliation_enabled
-#   Boolean - Enables or disables continuous membership reconciliation.
-#   This requires RabbitMQ 3.13 or higher. More information on this configuration
+#   Enables or disables continuous membership reconciliation.
+#   This REQUIRES RabbitMQ 3.13 or higher to be set to true. More information on this configuration
 #   can be found here: https://www.rabbitmq.com/docs/quorum-queues
 # @param quorum_membership_reconciliation_auto_remove
-#   Boolean - Enables or disables automatic removal of member nodes that are no longer part of the cluster, 
-#   but still a member of the quorum queue. This requires RabbitMQ 3.13 or higher. More information on this configuration
-#   can be found here: https://www.rabbitmq.com/docs/quorum-queues
+#   Enables or disables automatic removal of member nodes that are no longer part of the cluster,
+#   but still a member of the quorum queue.
 #   Important Note: This only takes affect if quorum_membership_reconciliation_enabled is set to true.
 # @param quorum_membership_reconciliation_interval
-#   Integer - The default evaluation interval in milliseconds. This requires RabbitMQ 3.13 or higher. More information on this configuration
-#   can be found here: https://www.rabbitmq.com/docs/quorum-queues
+#   The default evaluation interval in milliseconds.
 #   Important Note: This only takes affect if quorum_membership_reconciliation_enabled is set to true.
 # @param quorum_membership_reconciliation_trigger_interval
-#   Integer - The reconciliation delay in milliseconds, used when a trigger event occurs, 
+#   The reconciliation delay in milliseconds, used when a trigger event occurs,
 #   for example, a node is added or removed from the cluster or an applicable policy changes.
 #   This delay will be applied only once, then the regular interval will be used again.
-#   This requires RabbitMQ 3.13 or higher. More information on this configuration
-#   can be found here: https://www.rabbitmq.com/docs/quorum-queues
 #   Important Note: This only takes affect if quorum_membership_reconciliation_enabled is set to true.
 # @param quorum_membership_reconciliation_target_group_size
-#   Integer - Controls the target group size for a quorum queue
-#   This requires RabbitMQ 3.13 or higher. More information on this configuration
-#   can be found here: https://www.rabbitmq.com/docs/quorum-queues
+#   Controls the target group size for a quorum queue
 #   Important Note: This only takes affect if quorum_membership_reconciliation_enabled is set to true.
 # @param repos_ensure
 #   Ensure that a repo with the official (and newer) RabbitMQ package is configured, along with its signing key.

spec/classes/rabbitmq_spec.rb

@@ -1801,12 +1801,12 @@
         let(:params) { { quorum_membership_reconciliation_enabled: :undef } }
 
         it 'sets quorum_membership_reconciliation_enabled parameter undef in config file' do
-          is_expected.not_to contain_file('rabbitmq.config'). \
-            with_content(%r{\{quorum_membership_reconciliation_enabled, .*\}}). \
-            with_content(%r{\{quorum_membership_reconciliation_auto_remove, .*\}}). \
-            with_content(%r{\{quorum_membership_reconciliation_interval, .*\}}). \
-            with_content(%r{\{quorum_membership_reconciliation_trigger_interval, .*\}}). \
-            with_content(%r{\{quorum_membership_reconciliation_target_group_size, .*\}})
+          is_expected.to contain_file('rabbitmq.config'). \
+            without_content(%r{\{quorum_membership_reconciliation_enabled, }). \
+            without_content(%r{\{quorum_membership_reconciliation_auto_remove, }). \
+            without_content(%r{\{quorum_membership_reconciliation_interval, }). \
+            without_content(%r{\{quorum_membership_reconciliation_trigger_interval, }). \
+            without_content(%r{\{quorum_membership_reconciliation_target_group_size, })
         end
       end
 
@@ -1817,12 +1817,12 @@
         let(:params) { { quorum_membership_reconciliation_enabled: false } }
 
         it 'sets quorum_membership_reconciliation_enabled parameter false in config file' do
-          is_expected.not_to contain_file('rabbitmq.config'). \
-            with_content(%r{\{quorum_membership_reconciliation_enabled, .*\}}). \
-            with_content(%r{\{quorum_membership_reconciliation_auto_remove, .*\}}). \
-            with_content(%r{\{quorum_membership_reconciliation_interval, .*\}}). \
-            with_content(%r{\{quorum_membership_reconciliation_trigger_interval, .*\}}). \
-            with_content(%r{\{quorum_membership_reconciliation_target_group_size, .*\}})
+          is_expected.to contain_file('rabbitmq.config'). \
+            without_content(%r{\{quorum_membership_reconciliation_enabled, }). \
+            without_content(%r{\{quorum_membership_reconciliation_auto_remove, }). \
+            without_content(%r{\{quorum_membership_reconciliation_interval, }). \
+            without_content(%r{\{quorum_membership_reconciliation_trigger_interval, }). \
+            without_content(%r{\{quorum_membership_reconciliation_target_group_size, })
         end
       end
 
@@ -1834,15 +1834,11 @@
 
         it 'sets quorum_membership_reconciliation_enabled parameter true in config file' do
           is_expected.to contain_file('rabbitmq.config'). \
-            with_content(%r{\{quorum_membership_reconciliation_enabled, true\}})
-        end
-
-        it 'sets quorum_membership_reconciliation_enabled parameter true in config file ONLY' do
-          is_expected.not_to contain_file('rabbitmq.config'). \
-            with_content(%r{\{quorum_membership_reconciliation_auto_remove, .*\}}). \
-            with_content(%r{\{quorum_membership_reconciliation_interval, .*\}}). \
-            with_content(%r{\{quorum_membership_reconciliation_trigger_interval, .*\}}). \
-            with_content(%r{\{quorum_membership_reconciliation_target_group_size, .*\}})
+            with_content(%r{\{quorum_membership_reconciliation_enabled, true\}}). \
+            without_content(%r{\{quorum_membership_reconciliation_auto_remove, }). \
+            without_content(%r{\{quorum_membership_reconciliation_interval, }). \
+            without_content(%r{\{quorum_membership_reconciliation_trigger_interval, }). \
+            without_content(%r{\{quorum_membership_reconciliation_target_group_size, })
         end
       end
 
@@ -1854,7 +1850,7 @@
             quorum_membership_reconciliation_enabled: true,
             quorum_membership_reconciliation_auto_remove: true,
             quorum_membership_reconciliation_interval: 36_000,
-            quorum_membership_reconciliation_trigger_interval: 3600,
+            quorum_membership_reconciliation_trigger_interval: 3_600,
             quorum_membership_reconciliation_target_group_size: 2
           }
         end