Add support for CentOS/RHEL 8

Author: nmaludy

.github/SECURITY.md

@@ -0,0 +1,3 @@
+# Vox Pupuli Security Policy
+
+Our vulnerabilities reporting process is at https://voxpupuli.org/security/

.sync.yml

@@ -8,6 +8,8 @@
     - set: ubuntu1804-64
     - set: centos6-64
     - set: centos7-64
+    # RabbitMQ fails to start via systemd unless /sys/fs/cgroup is mounted through from to base host
+    - set: centos8-64{mount_folders={sysfscgroup={host_path=/sys/fs/cgroup\,container_path=/sys/fs/cgroup\,opts=ro}}}
 appveyor.yml:
   delete: true
 spec/spec_helper.rb:

.travis.yml

@@ -1,4 +1,5 @@
 ---
+os: linux
 dist: bionic
 language: ruby
 cache: bundler
@@ -7,7 +8,7 @@ before_install:
   - bundle --version
 script:
   - 'bundle exec rake $CHECK'
-matrix:
+jobs:
   fast_finish: true
   include:
   - rvm: 2.4.4
@@ -70,6 +71,14 @@ matrix:
     bundler_args: --without development release
     env: BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_setfile=centos7-64 CHECK=beaker
     services: docker
+  - rvm: 2.5.3
+    bundler_args: --without development release
+    env: BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_setfile=centos8-64{mount_folders={sysfscgroup={host_path=/sys/fs/cgroup\,container_path=/sys/fs/cgroup\,opts=ro}}} CHECK=beaker
+    services: docker
+  - rvm: 2.5.3
+    bundler_args: --without development release
+    env: BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_setfile=centos8-64{mount_folders={sysfscgroup={host_path=/sys/fs/cgroup\,container_path=/sys/fs/cgroup\,opts=ro}}} CHECK=beaker
+    services: docker
 branches:
   only:
   - master
@@ -84,7 +93,7 @@ notifications:
       - "chat.freenode.org#voxpupuli-notifications"
 deploy:
   provider: puppetforge
-  user: puppet
+  username: puppet
   password:
     secure: "Ojc0h2mbt9Y+eCyiKD+x1iYNONOP27Me63hjo9jo2v1bSs3aiM7djlcpz/sG+jRJ7JQoUyaGzHSn+gvxwWqdagFfFgDmipMKD0OXQinq7upRaG2hR+akKo0jllq9zLjJGBDoxurioKfOzPGlt2bX3UYY5KyeJ3AIM4dwCGVtSh4="
   on:

Gemfile

@@ -11,7 +11,7 @@ def location_for(place, fake_version = nil)
 end
 
 group :test do
-  gem 'voxpupuli-test', '>= 1.0.0',  :require => false
+  gem 'voxpupuli-test', '>= 1.4.0',  :require => false
   gem 'coveralls',                   :require => false
   gem 'simplecov-console',           :require => false
 end

README.md

@@ -18,7 +18,6 @@
 4. [Usage - Configuration options and additional functionality](#usage)
 5. [Reference - An under-the-hood peek at what the module is doing and how](#reference)
 5. [Limitations - OS compatibility, etc.](#limitations)
-   * [RedHat module dependencies](#redhat-module-dependecies)
 6. [Development - Guide for contributing to the module](#development)
 
 ## Overview
@@ -54,6 +53,38 @@ You can view example usage in [REFERENCE](REFERENCE.md).
 
 See [REFERENCE](REFERENCE.md).
 
+## Limitations
+
+If running CentOS/RHEL, ensure the `epel` repo, or another repo containing a
+suitable Erlang version, is present. On Debian systems, puppetlabs/apt
+(>=2.0.0 < 5.0.0) is a soft dependency.
+
+To have a suitable erlang version installed on RedHat and Debian systems,
+you have to install another puppet module from https://forge.puppetlabs.com/garethr/erlang with:
+
+    puppet module install garethr-erlang
+
+This module handles the packages for erlang.
+To use the module, add the following snippet to your site.pp or an appropriate profile class:
+
+For RedHat systems:
+```puppet
+include 'erlang'
+class { 'erlang':
+  epel_enable => true,
+}
+```
+
+For Debian systems:
+```puppet
+include 'erlang'
+package { 'erlang-base':
+  ensure => 'latest',
+}
+```
+
+This module also depends on voxpupuli/archive to install rabbitmqadmin.
+
 ## Development
 
 This module is maintained by [Vox Pupuli](https://voxpupuli.org/). Voxpupuli

data/family/RedHat-8.yaml

@@ -0,0 +1,3 @@
+---
+rabbitmq::python_package: 'python3'
+rabbitmq::repos_ensure: true

hiera.yaml

@@ -10,6 +10,8 @@ hierarchy:
     path: "os/%{facts.os.name}-%{facts.os.release.major}.yaml"
   - name: 'Distribution Name'
     path: "os/%{facts.os.name}.yaml"
+  - name: 'Operating System Family Version'
+    path: "family/%{facts.os.family}-%{facts.os.release.major}.yaml"
   - name: 'Operating System Family'
     path: "family/%{facts.os.family}.yaml"
   - name: 'Common'

lib/puppet/provider/rabbitmq_plugin/rabbitmqplugins.rb

@@ -4,12 +4,30 @@
 Puppet::Type.type(:rabbitmq_plugin).provide(:rabbitmqplugins, parent: Puppet::Provider::RabbitmqCli) do
   confine feature: :posix
 
-  def self.instances
-    plugin_list = run_with_retries do
-      rabbitmqplugins('list', '-E', '-m')
+  def self.plugin_list
+    list_str = run_with_retries do
+      # Pass in -e to list both implicitly and explicitly enabled plugins.
+      # If you pass in -E instead, then only explicitly enabled plugins are listed.
+      # Implicitly enabled plugins are those that were enabled as a dependency of another plugin/
+      # If we do not pass in -e then the order if plugin installation matters within the puppet
+      # code. Example, if Plugin A depends on Plugin B and we install Plugin B first it will
+      # implicitly enable Plugin A. Then when we go to run Puppet a second time without the
+      # -e parameter, we won't see Plugin A as being enabled so we'll try to install it again.
+      # To preserve idempotency we should get all enabled plugins regardless of implicitly or
+      # explicitly enabled.
+      rabbitmqplugins('list', '-e', '-m')
     end
+    # Split by newline.
+    lines = list_str.split(%r{\n})
+    # Return only lines that are single words because sometimes RabbitMQ likes to output
+    # information messages. Suppressing those messages via CLI flags is inconsistent between
+    # versions, so this this regex removes those message without having to use painful
+    # version switches.
+    lines.select { |line| line =~ %r{^(\S+)$} }
+  end
 
-    plugin_list.split(%r{\n}).map do |line|
+  def self.instances
+    plugin_list.map do |line|
       raise Puppet::Error, "Cannot parse invalid plugins line: #{line}" unless line =~ %r{^(\S+)$}
       new(name: Regexp.last_match(1))
     end
@@ -32,6 +50,6 @@ def destroy
   end
 
   def exists?
-    run_with_retries { rabbitmqplugins('list', '-E', '-m') }.split(%r{\n}).include? resource[:name]
+    self.class.plugin_list.include? resource[:name]
   end
 end

metadata.json

@@ -12,14 +12,16 @@
       "operatingsystem": "RedHat",
       "operatingsystemrelease": [
         "6",
-        "7"
+        "7",
+        "8"
       ]
     },
     {
       "operatingsystem": "CentOS",
       "operatingsystemrelease": [
         "6",
-        "7"
+        "7",
+        "8"
       ]
     },
     {

spec/classes/rabbitmq_spec.rb

@@ -29,8 +29,13 @@
       context 'with default params' do
         it { is_expected.not_to contain_class('rabbitmq::repo::apt') }
         it { is_expected.not_to contain_apt__source('rabbitmq') }
-        it { is_expected.not_to contain_class('rabbitmq::repo::rhel') }
-        it { is_expected.not_to contain_yumrepo('rabbitmq') }
+        if facts[:os]['family'] == 'RedHat' && facts[:os]['release']['major'] == '8'
+          it { is_expected.to contain_class('rabbitmq::repo::rhel') }
+          it { is_expected.to contain_yumrepo('rabbitmq') }
+        else
+          it { is_expected.not_to contain_class('rabbitmq::repo::rhel') }
+          it { is_expected.not_to contain_yumrepo('rabbitmq') }
+        end
       end
 
       context 'with service_restart => false' do
@@ -185,6 +190,19 @@
 
         context 'with service_manage set to true' do
           let(:params) { { admin_enable: true, management_ip_address: '1.1.1.1', service_manage: true } }
+          let(:python_package) do
+            if %w[Debian SUSE].include?(facts[:os]['family'])
+              'python'
+            elsif %w[FreeBSD OpenBSD].include?(facts[:os]['family'])
+              'python2'
+            elsif facts[:os]['family'] == 'RedHat'
+              if facts[:os]['release']['major'] == '8'
+                'python3'
+              else
+                'python'
+              end
+            end
+          end
 
           context 'with rabbitmqadmin_package set to blub' do
             let(:params) { { rabbitmqadmin_package: 'blub' } }
@@ -206,12 +224,7 @@
               is_expected.to contain_archive('rabbitmqadmin').with_source('http://1.1.1.1:15672/cli/rabbitmqadmin')
             end
           end
-          if %w[RedHat Debian SUSE].include?(facts[:os]['family'])
-            it { is_expected.to contain_package('python') }
-          end
-          if %w[FreeBSD OpenBSD].include?(facts[:os]['family'])
-            it { is_expected.to contain_package('python2') }
-          end
+          it { is_expected.to contain_package(python_package) if python_package }
         end
         context 'with manage_python false' do
           let(:params) { { manage_python: false } }
@@ -220,6 +233,7 @@
             is_expected.to contain_class('rabbitmq::install::rabbitmqadmin')
             is_expected.not_to contain_package('python')
             is_expected.not_to contain_package('python2')
+            is_expected.not_to contain_package('python3')
           end
         end