Add official support for CentOS/RHEL 8

This change makes CentOS 8 and RHEL 8 as a suppotrted OS. For CentOS 8 RabbitMQ package is not available in EPEL and PackageCloud repos should be used instead. This change adds support for additional erlang repository so that users can install rabbitmq correctly without missing dependencies. [1] https://www.rabbitmq.com/install-rpm.html
voxpupuli · Mar 13, 2022 · 9f132dc · 9f132dc
1 parent 326a63c
commit 9f132dc
Show file tree

Hide file tree

Showing 16 changed files with 123 additions and 86 deletions.
diff --git a/data/family/RedHat.yaml b/data/family/RedHat.yaml
@@ -1,4 +1,7 @@
 ---
+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'
+rabbitmq::erlang_package_gpg_key: 'https://packagecloud.io/rabbitmq/erlang/gpgkey'
+rabbitmq::rabbitmq_release_gpg_key: 'https:/rabbitmq/signing-keys/releases/download/2.0/rabbitmq-release-signing-key.asc'
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -213,6 +213,14 @@
 # RPM package GPG key to import. Uses source method. Should be a URL for Debian/RedHat OS family, or a file name for
 # RedHat OS family. Set to https://packagecloud.io/rabbitmq/rabbitmq-server/gpgkey for Debian/RedHat OS Family by
 # default. Note, that `key_content`, if specified, would override this parameter for Debian OS family.
+# @param erlang_package_gpg_key
+# RPM package GPG key to import for erlang packages. Uses source method. This is currently used by RedHat OS Family
+# only and should be a file name. Set to https://packagecloud.io/rabbitmq/erlang/gpgkey for RedHat OS Faimily by
+# default.
+# @param rabbitmq_release_gpg_key
+# Primary RabbitMQ signing key. Uses source method. This is currently used by RedHat OS Family only and should be
+# a file name. Set to https:/rabbitmq/signing-keys/releases/download/2.0/rabbitmq-release-signing-key.asc
+# for RedHat OS Faimily by default.
 # @param package_name
 # Name(s) of the package(s) to install
 # @param port
@@ -355,6 +363,8 @@
  Optional[Variant[Numeric, String]] $package_apt_pin = undef,
  String $package_ensure = 'installed',
  Optional[String] $package_gpg_key = undef,
+ Optional[String] $erlang_package_gpg_key = undef,
+ Optional[String] $rabbitmq_release_gpg_key = undef,
  Variant[String, Array] $package_name = 'rabbitmq',
  Optional[String] $package_source = undef,
  Optional[String] $package_provider = undef,
@@ -475,6 +485,9 @@
  'RedHat': {
  contain rabbitmq::repo::rhel
  Class['rabbitmq::repo::rhel'] -> Class['rabbitmq::install']
+
+ contain rabbitmq::repo::rhel::erlang
+ Class['rabbitmq::repo::rhel::erlang'] -> Class['rabbitmq::install']
  }
  'Debian': {
  contain rabbitmq::repo::apt

diff --git a/manifests/repo/rhel.pp b/manifests/repo/rhel.pp
@@ -2,14 +2,15 @@
 #
 # @api private
 class rabbitmq::repo::rhel (
- $location = "https://packagecloud.io/rabbitmq/rabbitmq-server/el/${facts['os'][release][major]}/\$basearch",
- String $key_source = $rabbitmq::package_gpg_key,
+ $location = "https://packagecloud.io/rabbitmq/rabbitmq-server/el/${facts['os'][release][major]}/\$basearch",
+ String $key_source = $rabbitmq::package_gpg_key,
+ String $rabbitmq_key_source = $rabbitmq::rabbitmq_release_gpg_key,
 ) {
  yumrepo { 'rabbitmq':
  ensure => present,
  name => 'rabbitmq_rabbitmq-server',
  baseurl => $location,
- gpgkey => $key_source,
+ gpgkey => "${key_source} ${rabbitmq_key_source}",
  enabled => 1,
  gpgcheck => 1,
  }
@@ -20,4 +21,9 @@
  path => ['/bin','/usr/bin','/sbin','/usr/sbin'],
  unless => 'rpm -q gpg-pubkey-6026dfca-573adfde 2>/dev/null',
  }
+
+ ensure_resource('exec', "rpm --import ${rabbitmq_key_source}", {
+ 'path' => ['/bin','/usr/bin','/sbin','/usr/sbin'],
+ 'unless'=> 'rpm -q gpg-pubkey-6026dfca-573adfde 2>/dev/null',
+ })
 }
diff --git a/manifests/repo/rhel/erlang.pp b/manifests/repo/rhel/erlang.pp
@@ -0,0 +1,29 @@
+# Makes sure that the Packagecloud repo for erlang is installed
+#
+# @api private
+class rabbitmq::repo::rhel::erlang (
+ $location = "https://packagecloud.io/rabbitmq/erlang/el/${facts['os'][release][major]}/\$basearch",
+ String $key_source = $rabbitmq::erlang_package_gpg_key,
+ String $rabbitmq_key_source = $rabbitmq::rabbitmq_release_gpg_key,
+) {
+ yumrepo { 'rabbitmq-erlang':
+ ensure => present,
+ name => 'rabbitmq_rabbitmq-erlang',
+ baseurl => $location,
+ gpgkey => "${key_source} ${rabbitmq_key_source}",
+ enabled => 1,
+ gpgcheck => 1,
+ }
+
+ # This may still be needed to prevent warnings
+ # packagecloud key is gpg-pubkey-df309a0b-5bbb8d6e
+ exec { "rpm --import ${key_source}":
+ path => ['/bin','/usr/bin','/sbin','/usr/sbin'],
+ unless => 'rpm -q gpg-pubkey-df309a0b-5bbb8d6e 2>/dev/null',
+ }
+
+ ensure_resource('exec', "rpm --import ${rabbitmq_key_source}", {
+ 'path' => ['/bin','/usr/bin','/sbin','/usr/sbin'],
+ 'unless'=> 'rpm -q gpg-pubkey-6026dfca-573adfde 2>/dev/null',
+ })
+}
diff --git a/metadata.json b/metadata.json
@@ -11,13 +11,15 @@
  {
  "operatingsystem": "RedHat",
  "operatingsystemrelease": [
- "7"
+ "7",
+ "8"
  ]
  },
  {
  "operatingsystem": "CentOS",
  "operatingsystemrelease": [
- "7"
+ "7",
+ "8"
  ]
  },
  {

diff --git a/spec/acceptance/class_spec.rb b/spec/acceptance/class_spec.rb
@@ -16,13 +16,13 @@
  service_name = 'rabbitmq'
  end
 
+ repos_ensure = (fact('os.family') == 'RedHat')
+
  context 'default class inclusion' do
  let(:pp) do
  <<-EOS
- class { 'rabbitmq': }
- if $facts['os']['family'] == 'RedHat' {
- class { 'erlang': epel_enable => true}
- Class['erlang'] -> Class['rabbitmq']
+ class { 'rabbitmq':
+ repos_ensure => #{repos_ensure},
  }
  EOS
  end
@@ -56,12 +56,9 @@ class { 'erlang': epel_enable => true}
  let(:pp) do
  <<-EOS
  class { 'rabbitmq':
+ repos_ensure => #{repos_ensure},
  service_ensure => 'stopped',
  }
- if $facts['os']['family'] == 'RedHat' {
- class { 'erlang': epel_enable => true}
- Class['erlang'] -> Class['rabbitmq']
- }
  EOS
  end
 
@@ -76,21 +73,16 @@ class { 'erlang': epel_enable => true}
  context 'service is unmanaged' do
  it 'runs successfully' do
  pp_pre = <<-EOS
- class { 'rabbitmq': }
- if $facts['os']['family'] == 'RedHat' {
- class { 'erlang': epel_enable => true}
- Class['erlang'] -> Class['rabbitmq']
+ class { 'rabbitmq':
+ repos_ensure => #{repos_ensure},
  }
  EOS
 
  pp = <<-EOS
  class { 'rabbitmq':
+ repos_ensure => #{repos_ensure},
  service_manage => false,
- service_ensure => 'stopped',
- }
- if $facts['os']['family'] == 'RedHat' {
- class { 'erlang': epel_enable => true}
- Class['erlang'] -> Class['rabbitmq']
+ service_ensure => 'stopped',
  }
  EOS
 
@@ -108,6 +100,7 @@ class { 'erlang': epel_enable => true}
  let(:pp) do
  <<-EOS
  class { 'rabbitmq':
+ repos_ensure => #{repos_ensure},
  service_manage => true,
  port => 5672,
  admin_enable => true,
@@ -138,6 +131,7 @@ class { 'rabbitmq':
  let(:pp) do
  <<-EOS
  class { 'rabbitmq':
+ repos_ensure => #{repos_ensure},
  service_manage => true,
  port => 5672,
  admin_enable => true,
@@ -169,6 +163,7 @@ class { 'rabbitmq':
  let(:pp) do
  <<-EOS
  class { 'rabbitmq':
+ repos_ensure => #{repos_ensure},
  service_manage => true,
  admin_enable => true,
  node_ip_address => '0.0.0.0',
@@ -198,6 +193,7 @@ class { 'rabbitmq':
  let(:pp) do
  <<-EOS
  class { 'rabbitmq':
+ repos_ensure => #{repos_ensure},
  service_manage => true,
  port => 5672,
  admin_enable => true,

diff --git a/spec/acceptance/clustering_spec.rb b/spec/acceptance/clustering_spec.rb
@@ -1,10 +1,13 @@
 require 'spec_helper_acceptance'
 
 describe 'rabbitmq clustering' do
+ repos_ensure = (fact('os.family') == 'RedHat')
+
  context 'rabbitmq::wipe_db_on_cookie_change => false' do
  it 'runs successfully' do
  pp = <<-EOS
  class { 'rabbitmq':
+ repos_ensure => #{repos_ensure},
  cluster => { 'name' => 'rabbit_cluster', 'init_node' => $facts['fqdn'] },
  config_cluster => true,
  cluster_nodes => ['rabbit1', 'rabbit2'],
@@ -13,10 +16,6 @@ class { 'rabbitmq':
  erlang_cookie => 'TESTCOOKIE',
  wipe_db_on_cookie_change => false,
  }
- if $facts['os']['family'] == 'RedHat' {
- class { 'erlang': epel_enable => true}
- Class['erlang'] -> Class['rabbitmq']
- }
  EOS
 
  apply_manifest(pp, expect_failures: true)
@@ -30,6 +29,7 @@ class { 'erlang': epel_enable => true}
  it 'runs successfully' do
  pp = <<-EOS
  class { 'rabbitmq':
+ repos_ensure => #{repos_ensure},
  cluster => { 'name' => 'rabbit_cluster', 'init_node' => $facts['fqdn'] },
  config_cluster => true,
  cluster_nodes => ['rabbit1', 'rabbit2'],
@@ -38,10 +38,6 @@ class { 'rabbitmq':
  erlang_cookie => 'TESTCOOKIE',
  wipe_db_on_cookie_change => true,
  }
- if $facts['os']['family'] == 'RedHat' {
- class { 'erlang': epel_enable => true}
- Class['erlang'] -> Class['rabbitmq']
- }
  EOS
 
  apply_manifest(pp, catch_failures: true)

diff --git a/spec/acceptance/delete_guest_user_spec.rb b/spec/acceptance/delete_guest_user_spec.rb
@@ -1,17 +1,16 @@
 require 'spec_helper_acceptance'
 
 describe 'rabbitmq with delete_guest_user' do
+ repos_ensure = (fact('os.family') == 'RedHat')
+
  context 'delete_guest_user' do
  it 'runs successfully' do
  pp = <<-EOS
  class { 'rabbitmq':
+ repos_ensure => #{repos_ensure},
  port => 5672,
  delete_guest_user => true,
  }
- if $facts['os']['family'] == 'RedHat' {
- class { 'erlang': epel_enable => true}
- Class['erlang'] -> Class['rabbitmq']
- }
  EOS
 
  apply_manifest(pp, catch_failures: true)

diff --git a/spec/acceptance/parameter_spec.rb b/spec/acceptance/parameter_spec.rb
@@ -1,14 +1,13 @@
 require 'spec_helper_acceptance'
 
 describe 'rabbitmq parameter on a vhost:' do
+ repos_ensure = (fact('os.family') == 'RedHat')
+
  context 'create parameter resource' do
  it 'runs successfully' do
  pp = <<-EOS
- if $facts['os']['family'] == 'RedHat' {
- class { 'erlang': epel_enable => true }
- Class['erlang'] -> Class['rabbitmq']
- }
  class { 'rabbitmq':
+ repos_ensure => #{repos_ensure},
  service_manage => true,
  port => 5672,
  delete_guest_user => true,

diff --git a/spec/acceptance/policy_spec.rb b/spec/acceptance/policy_spec.rb
@@ -1,14 +1,13 @@
 require 'spec_helper_acceptance'
 
 describe 'rabbitmq policy on a vhost:' do
+ repos_ensure = (fact('os.family') == 'RedHat')
+
  context 'create policy resource' do
  it 'runs successfully' do
  pp = <<-EOS
- if $facts['os']['family'] == 'RedHat' {
- class { 'erlang': epel_enable => true }
- Class['erlang'] -> Class['rabbitmq']
- }
  class { 'rabbitmq':
+ repos_ensure => #{repos_ensure},
  service_manage => true,
  port => 5672,
  delete_guest_user => true,

diff --git a/spec/acceptance/queue_spec.rb b/spec/acceptance/queue_spec.rb
@@ -1,14 +1,13 @@
 require 'spec_helper_acceptance'
 
 describe 'rabbitmq binding:' do
+ repos_ensure = (fact('os.family') == 'RedHat')
+
  context 'create binding and queue resources when using default management port' do
  it 'runs successfully' do
  pp = <<-EOS
- if $facts['os']['family'] == 'RedHat' {
- class { 'erlang': epel_enable => true }
- Class['erlang'] -> Class['rabbitmq']
- }
  class { 'rabbitmq':
+ repos_ensure => #{repos_ensure},
  service_manage => true,
  port => 5672,
  delete_guest_user => true,
@@ -78,11 +77,8 @@ class { 'rabbitmq':
  context 'create multiple bindings when same source / destination / vhost but different routing keys' do
  it 'runs successfully' do
  pp = <<-EOS
- if $facts['os']['family'] == 'RedHat' {
- class { 'erlang': epel_enable => true }
- Class['erlang'] -> Class['rabbitmq']
- }
  class { 'rabbitmq':
+ repos_ensure => #{repos_ensure},
  service_manage => true,
  port => 5672,
  delete_guest_user => true,
@@ -166,11 +162,8 @@ class { 'rabbitmq':
  context 'create binding and queue resources when using a non-default management port' do
  it 'runs successfully' do
  pp = <<-EOS
- if $facts['os']['family'] == 'RedHat' {
- class { 'erlang': epel_enable => true }
- Class['erlang'] -> Class['rabbitmq']
- }
  class { 'rabbitmq':
+ repos_ensure => #{repos_ensure},
  service_manage => true,
  port => 5672,
  management_port => 11111,