Showing with 16 additions and 7 deletions.
  1. +9 −0 CHANGELOG.md
  2. +2 −2 metadata.json
  3. +2 −2 spec/classes/rabbitmq_spec.rb
  4. +3 −3 templates/rabbitmq.config.epp
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,15 @@ All notable changes to this project will be documented in this file.
Each new release typically also includes the latest modulesync defaults.
These should not affect the functionality of the module.

## [v13.5.1](https://github.com/voxpupuli/puppet-rabbitmq/tree/v13.5.1) (2024-05-29)

[Full Changelog](https://github.com/voxpupuli/puppet-rabbitmq/compare/v13.5.0...v13.5.1)

**Fixed bugs:**

- Fix indentation for cluster\_nodes [\#1002](https://github.com/voxpupuli/puppet-rabbitmq/pull/1002) ([jplindquist](https://github.com/jplindquist))
- require puppet/systemd \>= 6.0.0 [\#1001](https://github.com/voxpupuli/puppet-rabbitmq/pull/1001) ([saz](https://github.com/saz))

## [v13.5.0](https://github.com/voxpupuli/puppet-rabbitmq/tree/v13.5.0) (2024-05-23)

[Full Changelog](https://github.com/voxpupuli/puppet-rabbitmq/compare/v13.4.0...v13.5.0)
Expand Down
4 changes: 2 additions & 2 deletions metadata.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "puppet-rabbitmq",
"version": "13.5.0",
"version": "13.5.1",
"author": "Vox Pupuli",
"summary": "Installs, configures, and manages RabbitMQ.",
"license": "Apache-2.0",
Expand Down Expand Up @@ -66,7 +66,7 @@
},
{
"name": "puppet/systemd",
"version_requirement": ">= 4.0.0 < 8.0.0"
"version_requirement": ">= 6.0.0 < 8.0.0"
}
],
"tags": [
Expand Down
4 changes: 2 additions & 2 deletions spec/classes/rabbitmq_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,7 @@
end

it 'for cluster_nodes' do
is_expected.to contain_file('rabbitmq.config').with('content' => %r{cluster_nodes.*\['rabbit@hare-1', 'rabbit@hare-2'\], ram})
is_expected.to contain_file('rabbitmq.config').with('content' => %r{^ {4}\{cluster_nodes, \{\['rabbit@hare-1', 'rabbit@hare-2'\], ram})
end
end

Expand All @@ -423,7 +423,7 @@
end

it 'for cluster_nodes' do
is_expected.to contain_file('rabbitmq.config').with('content' => %r{cluster_nodes.*\[\], ram})
is_expected.to contain_file('rabbitmq.config').with('content' => %r{^ {4}\{cluster_nodes, \{\[\], ram})
end
end
end
Expand Down
6 changes: 3 additions & 3 deletions templates/rabbitmq.config.epp
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
{auth_backends, [rabbit_auth_backend_internal, rabbit_auth_backend_ldap]},
<% } -%>
<% if $rabbitmq::config::config_cluster {-%>
<% if !$rabbitmq::config::cluster_nodes.empty {-%>
<%- if !$rabbitmq::config::cluster_nodes.empty {-%>
{cluster_nodes, {['rabbit@<%= $rabbitmq::config::cluster_nodes.join("', 'rabbit@") %>'], <%= $rabbitmq::config::cluster_node_type %>}},
<% } else {%>
<%- } else {-%>
{cluster_nodes, {[], <%= $rabbitmq::config::cluster_node_type %>}},
<% } %>
<%- } -%>
{cluster_partition_handling, <%= $rabbitmq::config::cluster_partition_handling %>},
<% } -%>
{tcp_listen_options, [
Expand Down