Showing with 39 additions and 38 deletions.
  1. +3 −0 .github/labeler.yml
  2. +0 −2 .github/workflows/ci.yml
  3. +1 −1 .msync.yml
  4. +5 −3 .overcommit.yml
  5. +0 −5 .rspec
  6. +0 −4 .rspec_parallel
  7. +13 −0 CHANGELOG.md
  8. +2 −2 Gemfile
  9. +1 −1 REFERENCE.md
  10. +1 −0 data/family/Debian.yaml
  11. +1 −1 manifests/config.pp
  12. +1 −1 manifests/init.pp
  13. +0 −3 manifests/service.pp
  14. +5 −3 metadata.json
  15. +6 −12 spec/classes/rabbitmq_spec.rb
3 changes: 3 additions & 0 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
skip-changelog:
- head-branch: ['^release-*', 'release']
2 changes: 0 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,3 @@ jobs:
puppet:
name: Puppet
uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v2
with:
pidfile_workaround: 'false'
2 changes: 1 addition & 1 deletion .msync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
# Managed by modulesync - DO NOT EDIT
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/

modulesync_config_version: '7.5.0'
modulesync_config_version: '9.0.0'
8 changes: 5 additions & 3 deletions .overcommit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,12 @@ PreCommit:
enabled: true
description: 'Runs rubocop on modified files only'
command: ['bundle', 'exec', 'rubocop']
PuppetLint:
RakeTarget:
enabled: true
description: 'Runs puppet-lint on modified files only'
command: ['bundle', 'exec', 'puppet-lint']
description: 'Runs lint on modified files only'
targets:
- 'lint'
command: ['bundle', 'exec', 'rake']
YamlSyntax:
enabled: true
JsonSyntax:
Expand Down
5 changes: 0 additions & 5 deletions .rspec

This file was deleted.

4 changes: 0 additions & 4 deletions .rspec_parallel

This file was deleted.

13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,19 @@ 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.6.0](https://github.com/voxpupuli/puppet-rabbitmq/tree/v13.6.0) (2024-06-28)

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

**Implemented enhancements:**

- Add support for Debian 11 [\#1010](https://github.com/voxpupuli/puppet-rabbitmq/pull/1010) ([wyardley](https://github.com/wyardley))
- Add support for FreeBSD 14 [\#1009](https://github.com/voxpupuli/puppet-rabbitmq/pull/1009) ([smortex](https://github.com/smortex))

**Merged pull requests:**

- replace systemd fact with core fact [\#1007](https://github.com/voxpupuli/puppet-rabbitmq/pull/1007) ([bastelfreak](https://github.com/bastelfreak))

## [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)
Expand Down
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
source ENV['GEM_SOURCE'] || 'https://rubygems.org'

group :test do
gem 'voxpupuli-test', '~> 7.0', :require => false
gem 'voxpupuli-test', '~> 8.0', :require => false
gem 'coveralls', :require => false
gem 'simplecov-console', :require => false
gem 'puppet_metadata', '~> 3.5', :require => false
gem 'puppet_metadata', '~> 4.0', :require => false
end

group :development do
Expand Down
2 changes: 1 addition & 1 deletion REFERENCE.md
Original file line number Diff line number Diff line change
Expand Up @@ -537,7 +537,7 @@ Default value: `undef`

Data type: `Variant[Integer[-1],Enum['unlimited'],Pattern[/^(infinity|\d+(:(infinity|\d+))?)$/]]`

Set rabbitmq file ulimit. Defaults to 16384. Only available on systems with systemd
Set rabbitmq file ulimit. Defaults to 16384. Only available on Linux

Default value: `16384`

Expand Down
1 change: 1 addition & 0 deletions data/family/Debian.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
---
rabbitmq::python_package: 'python3'
rabbitmq::package_name: 'rabbitmq-server'
rabbitmq::service_name: 'rabbitmq-server'
rabbitmq::package_gpg_key: 'https://packagecloud.io/rabbitmq/rabbitmq-server/gpgkey'
2 changes: 1 addition & 1 deletion manifests/config.pp
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@
}
}
if $facts['systemd'] { # systemd fact provided by systemd module
if $facts['kernel'] == 'Linux' {
systemd::manage_dropin { 'service-90-limits.conf':
unit => "${service_name}.service",
selinux_ignore_defaults => ($facts['os']['family'] == 'RedHat'),
Expand Down
2 changes: 1 addition & 1 deletion manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@
# set explicitly if using clustering. If you run Pacemaker and you don't want to use RabbitMQ buildin cluster, you can set config_cluster
# to 'False' and set 'erlang_cookie'.
# @param file_limit
# Set rabbitmq file ulimit. Defaults to 16384. Only available on systems with systemd
# Set rabbitmq file ulimit. Defaults to 16384. Only available on Linux
# @param oom_score_adj
# Set rabbitmq-server process OOM score. Defaults to 0.
# @param heartbeat
Expand Down
3 changes: 0 additions & 3 deletions manifests/service.pp
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,5 @@
hasrestart => true,
name => $service_name,
}
if $facts['systemd'] and defined(Class['systemd::systemctl::daemon_reload']) {
Class['systemd::systemctl::daemon_reload'] -> Service['rabbitmq-server']
}
}
}
8 changes: 5 additions & 3 deletions metadata.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{

Check warning on line 1 in metadata.json

View workflow job for this annotation

GitHub Actions / Puppet / Static validations

Skipping EOL operating system Debian 10

Check warning on line 1 in metadata.json

View workflow job for this annotation

GitHub Actions / Puppet / Static validations

Skipping EOL operating system Ubuntu 18.04
"name": "puppet-rabbitmq",
"version": "13.5.1",
"version": "13.6.0",
"author": "Vox Pupuli",
"summary": "Installs, configures, and manages RabbitMQ.",
"license": "Apache-2.0",
Expand All @@ -23,7 +23,8 @@
{
"operatingsystem": "Debian",
"operatingsystemrelease": [
"10"
"10",
"11"
]
},
{
Expand All @@ -42,7 +43,8 @@
"operatingsystem": "FreeBSD",
"operatingsystemrelease": [
"12",
"13"
"13",
"14"
]
},
{
Expand Down
18 changes: 6 additions & 12 deletions spec/classes/rabbitmq_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
end

['infinity', -1, 1234].each do |value|
context "with file_limit => '#{value}'", if: os_facts['systemd'] do
context "with file_limit => '#{value}'", if: os_facts['kernel'] == 'Linux' do
let(:params) { { file_limit: value } }

selinux_ignore_defaults = os_facts[:os]['family'] == 'RedHat'
Expand All @@ -143,7 +143,7 @@
end

[-1000, 0, 1000].each do |value|
context "with oom_score_adj => '#{value}'", if: os_facts['systemd'] do
context "with oom_score_adj => '#{value}'", if: os_facts[:kernel] == 'Linux' do
let(:params) { { oom_score_adj: value } }

it { is_expected.to contain_systemd__manage_dropin('service-90-limits.conf').with_service_entry({ 'LimitNOFILE' => 16_384, 'OOMScoreAdjust' => value }) }
Expand All @@ -160,11 +160,11 @@
end
end

context 'on systems with systemd', if: os_facts['systemd'] do
context 'on Linux', if: os_facts[:kernel] == 'Linux' do
it { is_expected.to contain_systemd__manage_dropin('service-90-limits.conf') }
end

context 'on systems without systemd', unless: os_facts['systemd'] do
context 'on non-Linux', unless: os_facts[:kernel] == 'Linux' do
it { is_expected.not_to contain_systemd__manage_dropin('service-90-limits.conf') }
end

Expand All @@ -190,7 +190,8 @@
is_expected.to contain_archive('rabbitmqadmin').with_source('http://1.1.1.1:15672/cli/rabbitmqadmin')
end

it { is_expected.to contain_package('python') } if %w[RedHat Debian SUSE Archlinux].include?(os_facts[:os]['family'])
it { is_expected.to contain_package('python') } if %w[RedHat SUSE Archlinux].include?(os_facts[:os]['family'])
it { is_expected.to contain_package('python3') } if %w[Debian].include?(os_facts[:os]['family'])
it { is_expected.to contain_package('python38') } if %w[FreeBSD].include?(os_facts[:os]['family'])
end

Expand Down Expand Up @@ -1747,13 +1748,6 @@
}
end

context 'on systems with systemd', if: os_facts[:systemd] do
it do
is_expected.to contain_service('rabbitmq-server').
that_requires('Class[systemd::systemctl::daemon_reload]')
end
end

describe 'service with ensure stopped' do
let :params do
{ service_ensure: 'stopped' }
Expand Down