Skip to content

Commit 187d330

Browse files
committed
Release 11.1.0
- Add support for oom_score_adj (voxpupuli#877) - CLI Environment Fixes (voxpupuli#876) - make sure the rabbitmq_version method actually returns the version (voxpupuli#874) - Use mocked facts in tests (voxpupuli#873) - Enable Puppet 7 support (voxpupuli#881) - Add auto cluster configuration support (voxpupuli#883)
1 parent 9e5164b commit 187d330

File tree

3 files changed

+86
-35
lines changed

3 files changed

+86
-35
lines changed

CHANGELOG.md

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,30 @@ All notable changes to this project will be documented in this file.
44
Each new release typically also includes the latest modulesync defaults.
55
These should not affect the functionality of the module.
66

7-
## [v11.0.0](https://github.com/voxpupuli/puppet-rabbitmq/tree/v11.0.0) (2021-01-16)
7+
## [v11.1.0](https://github.com/voxpupuli/puppet-rabbitmq/tree/v11.1.0) (2021-05-06)
8+
9+
[Full Changelog](https://github.com/voxpupuli/puppet-rabbitmq/compare/v11.0.0...v11.1.0)
10+
11+
**Implemented enhancements:**
12+
13+
- Add auto cluster configuration support [\#883](https://github.com/voxpupuli/puppet-rabbitmq/pull/883) ([fatpat](https://github.com/fatpat))
14+
- Enable Puppet 7 support \(where applicable\) [\#881](https://github.com/voxpupuli/puppet-rabbitmq/pull/881) ([bastelfreak](https://github.com/bastelfreak))
15+
- Add support for oom\_score\_adj [\#877](https://github.com/voxpupuli/puppet-rabbitmq/pull/877) ([jlutran](https://github.com/jlutran))
16+
17+
**Fixed bugs:**
18+
19+
- CLI Environment Fixes [\#876](https://github.com/voxpupuli/puppet-rabbitmq/pull/876) ([bishopbm1](https://github.com/bishopbm1))
20+
- make sure the rabbitmq\_version method actually returns the version. [\#874](https://github.com/voxpupuli/puppet-rabbitmq/pull/874) ([TomRitserveldt](https://github.com/TomRitserveldt))
21+
22+
**Closed issues:**
23+
24+
- Auto Clustering of nodes should be enabled [\#792](https://github.com/voxpupuli/puppet-rabbitmq/issues/792)
25+
26+
**Merged pull requests:**
27+
28+
- Use mocked facts in tests [\#873](https://github.com/voxpupuli/puppet-rabbitmq/pull/873) ([ekohl](https://github.com/ekohl))
29+
30+
## [v11.0.0](https://github.com/voxpupuli/puppet-rabbitmq/tree/v11.0.0) (2021-01-17)
831

932
[Full Changelog](https://github.com/voxpupuli/puppet-rabbitmq/compare/v10.3.0...v11.0.0)
1033

REFERENCE.md

Lines changed: 61 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ _Private Classes_
2222
**Resource types**
2323

2424
* [`rabbitmq_binding`](#rabbitmq_binding): Native type for managing rabbitmq bindings rabbitmq_binding { 'binding 1': ensure => present, source => 'myexchange'
25-
* [`rabbitmq_cluster`](#rabbitmq_cluster): Type to manage a rabbitmq cluster
25+
* [`rabbitmq_cluster`](#rabbitmq_cluster): Native type for managing rabbitmq cluster
2626
* [`rabbitmq_erlang_cookie`](#rabbitmq_erlang_cookie): Type to manage the rabbitmq erlang cookie securely This is essentially a private type used by the rabbitmq::config class to manage the erlan
2727
* [`rabbitmq_exchange`](#rabbitmq_exchange): Native type for managing rabbitmq exchanges
2828
* [`rabbitmq_parameter`](#rabbitmq_parameter): Type for managing rabbitmq parameters
@@ -141,23 +141,12 @@ This will result in the following config appended to the config file:
141141

142142
```puppet
143143
class { 'rabbitmq':
144-
config_cluster => true,
145-
cluster_nodes => ['rabbit1', 'rabbit2'],
146-
cluster_node_type => 'ram',
147-
erlang_cookie => 'A_SECRET_COOKIE_STRING',
148-
wipe_db_on_cookie_change => true,
149-
}
150-
```
151-
152-
To create and join the cluster:
153-
```puppet
154-
class { 'rabbitmq':
155-
config_cluster => true,
156-
cluster_nodes => ['rabbit1', 'rabbit2'],
157144
cluster => {
158145
'name' => 'test_cluster',
159146
'init_node' => 'hostname'
160147
},
148+
config_cluster => true,
149+
cluster_nodes => ['rabbit1', 'rabbit2'],
161150
cluster_node_type => 'ram',
162151
erlang_cookie => 'A_SECRET_COOKIE_STRING',
163152
wipe_db_on_cookie_change => true,
@@ -205,6 +194,14 @@ rabbit_auth_backend_ldap].
205194

206195
Default value: `undef`
207196

197+
##### `cluster`
198+
199+
Data type: `Hash`
200+
201+
Join cluster and change name of cluster.
202+
203+
Default value: $rabbitmq::cluster
204+
208205
##### `cluster_node_type`
209206

210207
Data type: `Enum['ram', 'disc']`
@@ -229,17 +226,6 @@ Value to set for `cluster_partition_handling` RabbitMQ configuration variable.
229226

230227
Default value: 'ignore'
231228

232-
##### `cluster`
233-
234-
Data type: `Hash`
235-
236-
If both `name` and `init_node` keys are set then the rabbitmq node is added to
237-
a cluster named after the corresponding key by joining `init_node`.
238-
Note: `init_node` must be included in the [`cluster_nodes`](#cluster_nodes)
239-
parameter.
240-
241-
Default value: '{}'
242-
243229
##### `collect_statistics_interval`
244230

245231
Data type: `Optional[Integer]`
@@ -402,6 +388,14 @@ Set rabbitmq file ulimit. Defaults to 16384. Only available on systems with `$::
402388

403389
Default value: 16384
404390

391+
##### `oom_score_adj`
392+
393+
Data type: `Integer[-1000, 1000]`
394+
395+
Set rabbitmq-server process OOM score. Defaults to 0.
396+
397+
Default value: 0
398+
405399
##### `heartbeat`
406400

407401
Data type: `Optional[Integer]`
@@ -1161,25 +1155,59 @@ Default value: guest
11611155

11621156
### rabbitmq_cluster
11631157

1164-
Type to manage a rabbitmq cluster
1158+
Native type for managing rabbitmq cluster
1159+
1160+
#### Examples
1161+
1162+
##### Configure a cluster, rabbit_cluster
1163+
1164+
```puppet
1165+
rabbitmq_cluster { 'rabbit_cluster':
1166+
init_node => 'host1'
1167+
}
1168+
```
1169+
1170+
##### Optional parameter tags will set further rabbitmq tags like monitoring, policymaker, etc.
1171+
1172+
```puppet
1173+
To set the cluster name use cluster_name.
1174+
rabbitmq_cluster { 'rabbit_cluster':
1175+
init_node => 'host1',
1176+
node_disc_type => 'ram',
1177+
}
1178+
```
11651179

11661180
#### Properties
11671181

11681182
The following properties are available in the `rabbitmq_cluster` type.
11691183

1170-
#### `init_node`
1184+
##### `ensure`
1185+
1186+
Valid values: present, absent
11711187

1172-
Data type: `String`
1188+
The basic property that the resource should be in.
11731189

1174-
The node to join to initiate the cluster. It is mandatory.
1190+
Default value: present
11751191

1176-
Default value: unset
1192+
#### Parameters
11771193

1178-
#### `node_disc_type`
1194+
The following parameters are available in the `rabbitmq_cluster` type.
11791195

1180-
Data type: `Enum['ram', 'disc']`
1196+
##### `name`
1197+
1198+
namevar
1199+
1200+
The cluster name
1201+
1202+
##### `init_node`
1203+
1204+
Name of which cluster node to join.
1205+
1206+
##### `node_disc_type`
1207+
1208+
Valid values: %r{disc|ram}
11811209

1182-
Choose between disc and ram cluster nodes.
1210+
Storage type of node, default disc.
11831211

11841212
Default value: disc
11851213

metadata.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "puppet-rabbitmq",
3-
"version": "11.0.1-rc0",
3+
"version": "11.1.0",
44
"author": "voxpupuli",
55
"summary": "Installs, configures, and manages RabbitMQ.",
66
"license": "Apache-2.0",

0 commit comments

Comments
 (0)