Skip to content

Commit d865ca9

Browse files
kajinamitkajinamit
committed
Add official support for CentOS/RHEL 8
This change makes CentOS 8 and RHEL 8 as a suppotrted OS. Because the rabbitmq-server package for CnetOS 8 is not available in EPEL, this change pulls packages of PackageCloud, following the RabbitMQ's documentation[1]. [1] https://www.rabbitmq.com/install-rpm.html Also, usage of garethr-erlang is replaced by puppet-epel, because garethr-erlang just includes the epel class in CentOS >= 6.
1 parent 16824ac commit d865ca9

File tree

11 files changed

+97
-68
lines changed

11 files changed

+97
-68
lines changed

‎metadata.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,15 @@
1111
{
1212
"operatingsystem": "RedHat",
1313
"operatingsystemrelease": [
14-
"7"
14+
"7",
15+
"8"
1516
]
1617
},
1718
{
1819
"operatingsystem": "CentOS",
1920
"operatingsystemrelease": [
20-
"7"
21+
"7",
22+
"8"
2123
]
2224
},
2325
{

‎spec/acceptance/class_spec.rb‎

Lines changed: 32 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
context 'default class inclusion' do
2020
let(:pp) do
2121
<<-EOS
22-
class { 'rabbitmq': }
23-
if $facts['os']['family'] == 'RedHat' {
24-
class { 'erlang': epel_enable => true}
25-
Class['erlang'] -> Class['rabbitmq']
22+
if $facts['os']['family'] == 'RedHat' and versioncmp($facts['os']['release']['major'], '8') < 0 {
23+
include 'epel'
24+
Class['epel'] -> Class['rabbitmq']
2625
}
26+
class { 'rabbitmq': }
2727
EOS
2828
end
2929

@@ -55,13 +55,13 @@ class { 'erlang': epel_enable => true}
5555
context 'disable and stop service' do
5656
let(:pp) do
5757
<<-EOS
58+
if $facts['os']['family'] == 'RedHat' and versioncmp($facts['os']['release']['major'], '8') < 0 {
59+
include 'epel'
60+
Class['epel'] -> Class['rabbitmq']
61+
}
5862
class { 'rabbitmq':
5963
service_ensure => 'stopped',
6064
}
61-
if $facts['os']['family'] == 'RedHat' {
62-
class { 'erlang': epel_enable => true}
63-
Class['erlang'] -> Class['rabbitmq']
64-
}
6565
EOS
6666
end
6767

@@ -76,22 +76,22 @@ class { 'erlang': epel_enable => true}
7676
context 'service is unmanaged' do
7777
it 'runs successfully' do
7878
pp_pre = <<-EOS
79-
class { 'rabbitmq': }
80-
if $facts['os']['family'] == 'RedHat' {
81-
class { 'erlang': epel_enable => true}
82-
Class['erlang'] -> Class['rabbitmq']
79+
if $facts['os']['family'] == 'RedHat' and versioncmp($facts['os']['release']['major'], '8') < 0 {
80+
include 'epel'
81+
Class['epel'] -> Class['rabbitmq']
8382
}
83+
class { 'rabbitmq': }
8484
EOS
8585

8686
pp = <<-EOS
87+
if $facts['os']['family'] == 'RedHat' and versioncmp($facts['os']['release']['major'], '8') < 0 {
88+
include 'epel'
89+
Class['epel'] -> Class['rabbitmq']
90+
}
8791
class { 'rabbitmq':
8892
service_manage => false,
8993
service_ensure => 'stopped',
9094
}
91-
if $facts['os']['family'] == 'RedHat' {
92-
class { 'erlang': epel_enable => true}
93-
Class['erlang'] -> Class['rabbitmq']
94-
}
9595
EOS
9696

9797
apply_manifest(pp_pre, catch_failures: true)
@@ -107,6 +107,10 @@ class { 'erlang': epel_enable => true}
107107
context 'binding on all interfaces' do
108108
let(:pp) do
109109
<<-EOS
110+
if $facts['os']['family'] == 'RedHat' and versioncmp($facts['os']['release']['major'], '8') < 0 {
111+
include 'epel'
112+
Class['epel'] -> Class['rabbitmq']
113+
}
110114
class { 'rabbitmq':
111115
service_manage => true,
112116
port => 5672,
@@ -137,6 +141,10 @@ class { 'rabbitmq':
137141
context 'binding to localhost only' do
138142
let(:pp) do
139143
<<-EOS
144+
if $facts['os']['family'] == 'RedHat' and versioncmp($facts['os']['release']['major'], '8') < 0 {
145+
include 'epel'
146+
Class['epel'] -> Class['rabbitmq']
147+
}
140148
class { 'rabbitmq':
141149
service_manage => true,
142150
port => 5672,
@@ -168,6 +176,10 @@ class { 'rabbitmq':
168176
context 'ssl enabled' do
169177
let(:pp) do
170178
<<-EOS
179+
if $facts['os']['family'] == 'RedHat' and versioncmp($facts['os']['release']['major'], '8') < 0 {
180+
include 'epel'
181+
Class['epel'] -> Class['rabbitmq']
182+
}
171183
class { 'rabbitmq':
172184
service_manage => true,
173185
admin_enable => true,
@@ -197,6 +209,10 @@ class { 'rabbitmq':
197209
context 'different management_ip_address and node_ip_address' do
198210
let(:pp) do
199211
<<-EOS
212+
if $facts['os']['family'] == 'RedHat' and versioncmp($facts['os']['release']['major'], '8') < 0 {
213+
include 'epel'
214+
Class['epel'] -> Class['rabbitmq']
215+
}
200216
class { 'rabbitmq':
201217
service_manage => true,
202218
port => 5672,

‎spec/acceptance/clustering_spec.rb‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44
context 'rabbitmq::wipe_db_on_cookie_change => false' do
55
it 'runs successfully' do
66
pp = <<-EOS
7+
if $facts['os']['family'] == 'RedHat' and versioncmp($facts['os']['release']['major'], '8') < 0 {
8+
include 'epel'
9+
Class['epel'] -> Class['rabbitmq']
10+
}
711
class { 'rabbitmq':
812
cluster => { 'name' => 'rabbit_cluster', 'init_node' => $facts['fqdn'] },
913
config_cluster => true,
@@ -13,10 +17,6 @@ class { 'rabbitmq':
1317
erlang_cookie => 'TESTCOOKIE',
1418
wipe_db_on_cookie_change => false,
1519
}
16-
if $facts['os']['family'] == 'RedHat' {
17-
class { 'erlang': epel_enable => true}
18-
Class['erlang'] -> Class['rabbitmq']
19-
}
2020
EOS
2121

2222
apply_manifest(pp, expect_failures: true)
@@ -29,6 +29,10 @@ class { 'erlang': epel_enable => true}
2929
context 'rabbitmq::wipe_db_on_cookie_change => true' do
3030
it 'runs successfully' do
3131
pp = <<-EOS
32+
if $facts['os']['family'] == 'RedHat' and versioncmp($facts['os']['release']['major'], '8') < 0 {
33+
include 'epel'
34+
Class['epel'] -> Class['rabbitmq']
35+
}
3236
class { 'rabbitmq':
3337
cluster => { 'name' => 'rabbit_cluster', 'init_node' => $facts['fqdn'] },
3438
config_cluster => true,
@@ -38,10 +42,6 @@ class { 'rabbitmq':
3842
erlang_cookie => 'TESTCOOKIE',
3943
wipe_db_on_cookie_change => true,
4044
}
41-
if $facts['os']['family'] == 'RedHat' {
42-
class { 'erlang': epel_enable => true}
43-
Class['erlang'] -> Class['rabbitmq']
44-
}
4545
EOS
4646

4747
apply_manifest(pp, catch_failures: true)

‎spec/acceptance/delete_guest_user_spec.rb‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
context 'delete_guest_user' do
55
it 'runs successfully' do
66
pp = <<-EOS
7+
if $facts['os']['family'] == 'RedHat' and versioncmp($facts['os']['release']['major'], '8') < 0 {
8+
include 'epel'
9+
Class['epel'] -> Class['rabbitmq']
10+
}
711
class { 'rabbitmq':
812
port => 5672,
913
delete_guest_user => true,
1014
}
11-
if $facts['os']['family'] == 'RedHat' {
12-
class { 'erlang': epel_enable => true}
13-
Class['erlang'] -> Class['rabbitmq']
14-
}
1515
EOS
1616

1717
apply_manifest(pp, catch_failures: true)

‎spec/acceptance/parameter_spec.rb‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
context 'create parameter resource' do
55
it 'runs successfully' do
66
pp = <<-EOS
7-
if $facts['os']['family'] == 'RedHat' {
8-
class { 'erlang': epel_enable => true }
9-
Class['erlang'] -> Class['rabbitmq']
7+
if $facts['os']['family'] == 'RedHat' and versioncmp($facts['os']['release']['major'], '8') < 0 {
8+
include 'epel'
9+
Class['epel'] -> Class['rabbitmq']
1010
}
1111
class { 'rabbitmq':
1212
service_manage => true,

‎spec/acceptance/policy_spec.rb‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
context 'create policy resource' do
55
it 'runs successfully' do
66
pp = <<-EOS
7-
if $facts['os']['family'] == 'RedHat' {
8-
class { 'erlang': epel_enable => true }
9-
Class['erlang'] -> Class['rabbitmq']
7+
if $facts['os']['family'] == 'RedHat' and versioncmp($facts['os']['release']['major'], '8') < 0 {
8+
include 'epel'
9+
Class['epel'] -> Class['rabbitmq']
1010
}
1111
class { 'rabbitmq':
1212
service_manage => true,

‎spec/acceptance/queue_spec.rb‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
context 'create binding and queue resources when using default management port' do
55
it 'runs successfully' do
66
pp = <<-EOS
7-
if $facts['os']['family'] == 'RedHat' {
8-
class { 'erlang': epel_enable => true }
9-
Class['erlang'] -> Class['rabbitmq']
7+
if $facts['os']['family'] == 'RedHat' and versioncmp($facts['os']['release']['major'], '8') < 0 {
8+
include 'epel'
9+
Class['epel'] -> Class['rabbitmq']
1010
}
1111
class { 'rabbitmq':
1212
service_manage => true,
@@ -78,9 +78,9 @@ class { 'rabbitmq':
7878
context 'create multiple bindings when same source / destination / vhost but different routing keys' do
7979
it 'runs successfully' do
8080
pp = <<-EOS
81-
if $facts['os']['family'] == 'RedHat' {
82-
class { 'erlang': epel_enable => true }
83-
Class['erlang'] -> Class['rabbitmq']
81+
if $facts['os']['family'] == 'RedHat' and versioncmp($facts['os']['release']['major'], '8') < 0 {
82+
include 'epel'
83+
Class['epel'] -> Class['rabbitmq']
8484
}
8585
class { 'rabbitmq':
8686
service_manage => true,
@@ -166,9 +166,9 @@ class { 'rabbitmq':
166166
context 'create binding and queue resources when using a non-default management port' do
167167
it 'runs successfully' do
168168
pp = <<-EOS
169-
if $facts['os']['family'] == 'RedHat' {
170-
class { 'erlang': epel_enable => true }
171-
Class['erlang'] -> Class['rabbitmq']
169+
if $facts['os']['family'] == 'RedHat' and versioncmp($facts['os']['release']['major'], '8') < 0 {
170+
include 'epel'
171+
Class['epel'] -> Class['rabbitmq']
172172
}
173173
class { 'rabbitmq':
174174
service_manage => true,

‎spec/acceptance/rabbitmqadmin_spec.rb‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
context 'downloads the cli tools' do
55
it 'runs successfully' do
66
pp = <<-EOS
7+
if $facts['os']['family'] == 'RedHat' and versioncmp($facts['os']['release']['major'], '8') < 0 {
8+
include 'epel'
9+
Class['epel'] -> Class['rabbitmq']
10+
}
711
class { 'rabbitmq':
812
admin_enable => true,
913
service_manage => true,
1014
}
11-
if $facts['os']['family'] == 'RedHat' {
12-
class { 'erlang': epel_enable => true}
13-
Class['erlang'] -> Class['rabbitmq']
14-
}
1515
EOS
1616

1717
apply_manifest(pp, catch_failures: true)
@@ -25,14 +25,14 @@ class { 'erlang': epel_enable => true}
2525
context 'does nothing if service is unmanaged' do
2626
it 'runs successfully' do
2727
pp = <<-EOS
28+
if $facts['os']['family'] == 'RedHat' and versioncmp($facts['os']['release']['major'], '8') < 0 {
29+
include 'epel'
30+
Class['epel'] -> Class['rabbitmq']
31+
}
2832
class { 'rabbitmq':
2933
admin_enable => true,
3034
service_manage => false,
3135
}
32-
if $facts['os']['family'] == 'RedHat' {
33-
class { 'erlang': epel_enable => true}
34-
Class['erlang'] -> Class['rabbitmq']
35-
}
3636
EOS
3737

3838
shell('rm -f /var/lib/rabbitmq/rabbitmqadmin')
@@ -48,28 +48,28 @@ class { 'erlang': epel_enable => true}
4848
it 'runs successfully' do
4949
# make sure credential change takes effect before admin_enable
5050
pp_pre = <<-EOS
51+
if $facts['os']['family'] == 'RedHat' and versioncmp($facts['os']['release']['major'], '8') < 0 {
52+
include 'epel'
53+
Class['epel'] -> Class['rabbitmq']
54+
}
5155
class { 'rabbitmq':
5256
service_manage => true,
5357
default_user => 'foobar',
5458
default_pass => 'bazblam',
5559
}
56-
if $facts['os']['family'] == 'RedHat' {
57-
class { 'erlang': epel_enable => true}
58-
Class['erlang'] -> Class['rabbitmq']
59-
}
6060
EOS
6161

6262
pp = <<-EOS
63+
if $facts['os']['family'] == 'RedHat' and versioncmp($facts['os']['release']['major'], '8') < 0 {
64+
include 'epel'
65+
Class['epel'] -> Class['rabbitmq']
66+
}
6367
class { 'rabbitmq':
6468
admin_enable => true,
6569
service_manage => true,
6670
default_user => 'foobar',
6771
default_pass => 'bazblam',
6872
}
69-
if $facts['os']['family'] == 'RedHat' {
70-
class { 'erlang': epel_enable => true}
71-
Class['erlang'] -> Class['rabbitmq']
72-
}
7373
EOS
7474

7575
shell('rm -f /var/lib/rabbitmq/rabbitmqadmin')

‎spec/acceptance/user_spec.rb‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
context 'create user resource' do
55
it 'runs successfully' do
66
pp = <<-EOS
7-
if $facts['os']['family'] == 'RedHat' {
8-
class { 'erlang': epel_enable => true }
9-
Class['erlang'] -> Class['rabbitmq']
7+
if $facts['os']['family'] == 'RedHat' and versioncmp($facts['os']['release']['major'], '8') < 0 {
8+
include 'epel'
9+
Class['epel'] -> Class['rabbitmq']
1010
}
1111
class { 'rabbitmq':
1212
service_manage => true,

‎spec/acceptance/vhost_spec.rb‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
context 'create vhost resource' do
55
it 'runs successfully' do
66
pp = <<-EOS
7-
if $facts['os']['family'] == 'RedHat' {
8-
class { 'erlang': epel_enable => true }
9-
Class['erlang'] -> Class['rabbitmq']
7+
if $facts['os']['family'] == 'RedHat' and versioncmp($facts['os']['release']['major'], '8') < 0 {
8+
include 'epel'
9+
Class['epel'] -> Class['rabbitmq']
1010
}
1111
class { 'rabbitmq':
1212
service_manage => true,

0 commit comments

Comments
 (0)