From 12e76e941f6f7b693affc789fb8637dd532f3278 Mon Sep 17 00:00:00 2001 From: William Yardley Date: Thu, 6 May 2021 10:00:41 -0700 Subject: [PATCH] Release 11.1.0 - Add support for oom_score_adj (#877) - CLI Environment Fixes (#876) - make sure the rabbitmq_version method actually returns the version (#874) - Use mocked facts in tests (#873) - Enable Puppet 7 support (#881) - Add auto cluster configuration support (#883) - Compatibility with camptocamp/systemd 3.x (#886) - puppetlabs/apt: Allow 8.x (#884) - puppet/archive: Allow 5.x (#884) - puppetlabs/stdlib: allow 7.x (#884) --- CHANGELOG.md | 29 +++++++++++++++- REFERENCE.md | 94 +++++++++++++++++++++++++++++++++------------------ metadata.json | 2 +- 3 files changed, 90 insertions(+), 35 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 33ea016ab..1b11b5dab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,34 @@ 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. -## [v11.0.0](https://github.com/voxpupuli/puppet-rabbitmq/tree/v11.0.0) (2021-01-16) +## [v11.1.0](https://github.com/voxpupuli/puppet-rabbitmq/tree/v11.1.0) (2021-05-06) + +[Full Changelog](https://github.com/voxpupuli/puppet-rabbitmq/compare/v11.0.0...v11.1.0) + +**Implemented enhancements:** + +- Compatibility with camptocamp/systemd 3.x [\#886](https://github.com/voxpupuli/puppet-rabbitmq/pull/886) ([TheMeier](https://github.com/TheMeier)) +- camptocamp/systemd: Allow 3.x [\#884](https://github.com/voxpupuli/puppet-rabbitmq/pull/884) ([bastelfreak](https://github.com/bastelfreak)) +- Add auto cluster configuration support [\#883](https://github.com/voxpupuli/puppet-rabbitmq/pull/883) ([fatpat](https://github.com/fatpat)) +- puppet/archive: Allow 5.x [\#882](https://github.com/voxpupuli/puppet-rabbitmq/pull/882) ([bastelfreak](https://github.com/bastelfreak)) +- Enable Puppet 7 support \(where applicable\) [\#881](https://github.com/voxpupuli/puppet-rabbitmq/pull/881) ([bastelfreak](https://github.com/bastelfreak)) +- puppetlabs/stdlib: allow 7.x [\#880](https://github.com/voxpupuli/puppet-rabbitmq/pull/880) ([bastelfreak](https://github.com/bastelfreak)) +- Add support for oom\_score\_adj [\#877](https://github.com/voxpupuli/puppet-rabbitmq/pull/877) ([jlutran](https://github.com/jlutran)) + +**Fixed bugs:** + +- CLI Environment Fixes [\#876](https://github.com/voxpupuli/puppet-rabbitmq/pull/876) ([bishopbm1](https://github.com/bishopbm1)) +- make sure the rabbitmq\_version method actually returns the version. [\#874](https://github.com/voxpupuli/puppet-rabbitmq/pull/874) ([TomRitserveldt](https://github.com/TomRitserveldt)) + +**Closed issues:** + +- Auto Clustering of nodes should be enabled [\#792](https://github.com/voxpupuli/puppet-rabbitmq/issues/792) + +**Merged pull requests:** + +- Use mocked facts in tests [\#873](https://github.com/voxpupuli/puppet-rabbitmq/pull/873) ([ekohl](https://github.com/ekohl)) + +## [v11.0.0](https://github.com/voxpupuli/puppet-rabbitmq/tree/v11.0.0) (2021-01-17) [Full Changelog](https://github.com/voxpupuli/puppet-rabbitmq/compare/v10.3.0...v11.0.0) diff --git a/REFERENCE.md b/REFERENCE.md index 8267abbc4..451c10cb0 100644 --- a/REFERENCE.md +++ b/REFERENCE.md @@ -22,7 +22,7 @@ _Private Classes_ **Resource types** * [`rabbitmq_binding`](#rabbitmq_binding): Native type for managing rabbitmq bindings rabbitmq_binding { 'binding 1': ensure => present, source => 'myexchange' -* [`rabbitmq_cluster`](#rabbitmq_cluster): Type to manage a rabbitmq cluster +* [`rabbitmq_cluster`](#rabbitmq_cluster): Native type for managing rabbitmq cluster * [`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 * [`rabbitmq_exchange`](#rabbitmq_exchange): Native type for managing rabbitmq exchanges * [`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: ```puppet class { 'rabbitmq': - config_cluster => true, - cluster_nodes => ['rabbit1', 'rabbit2'], - cluster_node_type => 'ram', - erlang_cookie => 'A_SECRET_COOKIE_STRING', - wipe_db_on_cookie_change => true, -} -``` - -To create and join the cluster: -```puppet -class { 'rabbitmq': - config_cluster => true, - cluster_nodes => ['rabbit1', 'rabbit2'], cluster => { 'name' => 'test_cluster', 'init_node' => 'hostname' }, + config_cluster => true, + cluster_nodes => ['rabbit1', 'rabbit2'], cluster_node_type => 'ram', erlang_cookie => 'A_SECRET_COOKIE_STRING', wipe_db_on_cookie_change => true, @@ -205,6 +194,14 @@ rabbit_auth_backend_ldap]. Default value: `undef` +##### `cluster` + +Data type: `Hash` + +Join cluster and change name of cluster. + +Default value: $rabbitmq::cluster + ##### `cluster_node_type` Data type: `Enum['ram', 'disc']` @@ -229,17 +226,6 @@ Value to set for `cluster_partition_handling` RabbitMQ configuration variable. Default value: 'ignore' -##### `cluster` - -Data type: `Hash` - -If both `name` and `init_node` keys are set then the rabbitmq node is added to -a cluster named after the corresponding key by joining `init_node`. -Note: `init_node` must be included in the [`cluster_nodes`](#cluster_nodes) -parameter. - -Default value: '{}' - ##### `collect_statistics_interval` Data type: `Optional[Integer]` @@ -402,6 +388,14 @@ Set rabbitmq file ulimit. Defaults to 16384. Only available on systems with `$:: Default value: 16384 +##### `oom_score_adj` + +Data type: `Integer[-1000, 1000]` + +Set rabbitmq-server process OOM score. Defaults to 0. + +Default value: 0 + ##### `heartbeat` Data type: `Optional[Integer]` @@ -1161,25 +1155,59 @@ Default value: guest ### rabbitmq_cluster -Type to manage a rabbitmq cluster +Native type for managing rabbitmq cluster + +#### Examples + +##### Configure a cluster, rabbit_cluster + +```puppet +rabbitmq_cluster { 'rabbit_cluster': + init_node => 'host1' +} +``` + +##### Optional parameter tags will set further rabbitmq tags like monitoring, policymaker, etc. + +```puppet +To set the cluster name use cluster_name. +rabbitmq_cluster { 'rabbit_cluster': + init_node => 'host1', + node_disc_type => 'ram', +} +``` #### Properties The following properties are available in the `rabbitmq_cluster` type. -#### `init_node` +##### `ensure` + +Valid values: present, absent -Data type: `String` +The basic property that the resource should be in. -The node to join to initiate the cluster. It is mandatory. +Default value: present -Default value: unset +#### Parameters -#### `node_disc_type` +The following parameters are available in the `rabbitmq_cluster` type. -Data type: `Enum['ram', 'disc']` +##### `name` + +namevar + +The cluster name + +##### `init_node` + +Name of which cluster node to join. + +##### `node_disc_type` + +Valid values: %r{disc|ram} -Choose between disc and ram cluster nodes. +Storage type of node, default disc. Default value: disc diff --git a/metadata.json b/metadata.json index fe16e8446..8cafc3aba 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "puppet-rabbitmq", - "version": "11.0.1-rc0", + "version": "11.1.0", "author": "voxpupuli", "summary": "Installs, configures, and manages RabbitMQ.", "license": "Apache-2.0",