Skip to content

Commit 36ebf1f

Browse files
nmaludynmaludy
committed
Switch to voxpupuli erlang module
1 parent 24a745b commit 36ebf1f

File tree

11 files changed

+122
-60
lines changed

11 files changed

+122
-60
lines changed

‎.fixtures.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ fixtures:
33
stdlib: 'https://github.com/puppetlabs/puppetlabs-stdlib'
44
apt: 'https://github.com/puppetlabs/puppetlabs-apt'
55
archive: 'https://github.com/voxpupuli/puppet-archive'
6-
erlang: 'https://github.com/garethr/garethr-erlang'
6+
erlang: 'https://github.com/voxpupuli/puppet-erlang'
77
systemd: 'https://github.com/camptocamp/puppet-systemd'
88
yumrepo_core:
99
repo: 'https://github.com/puppetlabs/puppetlabs-yumrepo_core'

‎spec/acceptance/class_spec.rb‎

Lines changed: 46 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,13 @@
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}
22+
class { 'erlang': }
2523
Class['erlang'] -> Class['rabbitmq']
26-
}
24+
if $facts['os']['family'] == 'RedHat' {
25+
class { 'epel': }
26+
Class['epel'] -> Class['rabbitmq']
27+
}
28+
class { 'rabbitmq': }
2729
EOS
2830
end
2931

@@ -55,13 +57,13 @@ class { 'erlang': epel_enable => true}
5557
context 'disable and stop service' do
5658
let(:pp) do
5759
<<-EOS
58-
class { 'rabbitmq':
59-
service_ensure => 'stopped',
60-
}
60+
class { 'erlang': }
61+
Class['erlang'] -> Class['rabbitmq']
6162
if $facts['os']['family'] == 'RedHat' {
62-
class { 'erlang': epel_enable => true}
63-
Class['erlang'] -> Class['rabbitmq']
63+
class { 'epel': }
64+
Class['epel'] -> Class['rabbitmq']
6465
}
66+
class { 'rabbitmq': }
6567
EOS
6668
end
6769

@@ -76,22 +78,26 @@ class { 'erlang': epel_enable => true}
7678
context 'service is unmanaged' do
7779
it 'runs successfully' do
7880
pp_pre = <<-EOS
79-
class { 'rabbitmq': }
81+
class { 'erlang': }
82+
Class['erlang'] -> Class['rabbitmq']
8083
if $facts['os']['family'] == 'RedHat' {
81-
class { 'erlang': epel_enable => true}
82-
Class['erlang'] -> Class['rabbitmq']
84+
class { 'epel': }
85+
Class['epel'] -> Class['rabbitmq']
8386
}
87+
class { 'rabbitmq': }
8488
EOS
8589

8690
pp = <<-EOS
91+
class { 'erlang': }
92+
Class['erlang'] -> Class['rabbitmq']
93+
if $facts['os']['family'] == 'RedHat' {
94+
class { 'epel': }
95+
Class['epel'] -> Class['rabbitmq']
96+
}
8797
class { 'rabbitmq':
8898
service_manage => false,
8999
service_ensure => 'stopped',
90100
}
91-
if $facts['os']['family'] == 'RedHat' {
92-
class { 'erlang': epel_enable => true}
93-
Class['erlang'] -> Class['rabbitmq']
94-
}
95101
EOS
96102

97103
apply_manifest(pp_pre, catch_failures: true)
@@ -107,6 +113,12 @@ class { 'erlang': epel_enable => true}
107113
context 'binding on all interfaces' do
108114
let(:pp) do
109115
<<-EOS
116+
class { 'erlang': }
117+
Class['erlang'] -> Class['rabbitmq']
118+
if $facts['os']['family'] == 'RedHat' {
119+
class { 'epel': }
120+
Class['epel'] -> Class['rabbitmq']
121+
}
110122
class { 'rabbitmq':
111123
service_manage => true,
112124
port => 5672,
@@ -137,6 +149,12 @@ class { 'rabbitmq':
137149
context 'binding to localhost only' do
138150
let(:pp) do
139151
<<-EOS
152+
class { 'erlang': }
153+
Class['erlang'] -> Class['rabbitmq']
154+
if $facts['os']['family'] == 'RedHat' {
155+
class { 'epel': }
156+
Class['epel'] -> Class['rabbitmq']
157+
}
140158
class { 'rabbitmq':
141159
service_manage => true,
142160
port => 5672,
@@ -168,6 +186,12 @@ class { 'rabbitmq':
168186
context 'ssl enabled' do
169187
let(:pp) do
170188
<<-EOS
189+
class { 'erlang': }
190+
Class['erlang'] -> Class['rabbitmq']
191+
if $facts['os']['family'] == 'RedHat' {
192+
class { 'epel': }
193+
Class['epel'] -> Class['rabbitmq']
194+
}
171195
class { 'rabbitmq':
172196
service_manage => true,
173197
admin_enable => true,
@@ -197,6 +221,12 @@ class { 'rabbitmq':
197221
context 'different management_ip_address and node_ip_address' do
198222
let(:pp) do
199223
<<-EOS
224+
class { 'erlang': }
225+
Class['erlang'] -> Class['rabbitmq']
226+
if $facts['os']['family'] == 'RedHat' {
227+
class { 'epel': }
228+
Class['epel'] -> Class['rabbitmq']
229+
}
200230
class { 'rabbitmq':
201231
service_manage => true,
202232
port => 5672,

‎spec/acceptance/clustering_spec.rb‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,19 @@
44
context 'rabbitmq::wipe_db_on_cookie_change => false' do
55
it 'runs successfully' do
66
pp = <<-EOS
7+
class { 'erlang': }
8+
Class['erlang'] -> Class['rabbitmq']
9+
if $facts['os']['family'] == 'RedHat' {
10+
class { 'epel': }
11+
Class['epel'] -> Class['rabbitmq']
12+
}
713
class { 'rabbitmq':
814
config_cluster => true,
915
cluster_nodes => ['rabbit1', 'rabbit2'],
1016
cluster_node_type => 'ram',
1117
erlang_cookie => 'TESTCOOKIE',
1218
wipe_db_on_cookie_change => false,
1319
}
14-
if $facts['os']['family'] == 'RedHat' {
15-
class { 'erlang': epel_enable => true}
16-
Class['erlang'] -> Class['rabbitmq']
17-
}
1820
EOS
1921

2022
apply_manifest(pp, expect_failures: true)
@@ -27,17 +29,19 @@ class { 'erlang': epel_enable => true}
2729
context 'rabbitmq::wipe_db_on_cookie_change => true' do
2830
it 'runs successfully' do
2931
pp = <<-EOS
32+
class { 'erlang': }
33+
Class['erlang'] -> Class['rabbitmq']
34+
if $facts['os']['family'] == 'RedHat' {
35+
class { 'epel': }
36+
Class['epel'] -> Class['rabbitmq']
37+
}
3038
class { 'rabbitmq':
3139
config_cluster => true,
3240
cluster_nodes => ['rabbit1', 'rabbit2'],
3341
cluster_node_type => 'ram',
3442
erlang_cookie => 'TESTCOOKIE',
3543
wipe_db_on_cookie_change => true,
3644
}
37-
if $facts['os']['family'] == 'RedHat' {
38-
class { 'erlang': epel_enable => true}
39-
Class['erlang'] -> Class['rabbitmq']
40-
}
4145
EOS
4246

4347
apply_manifest(pp, catch_failures: true)

‎spec/acceptance/delete_guest_user_spec.rb‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,16 @@
44
context 'delete_guest_user' do
55
it 'runs successfully' do
66
pp = <<-EOS
7+
class { 'erlang': }
8+
Class['erlang'] -> Class['rabbitmq']
9+
if $facts['os']['family'] == 'RedHat' {
10+
class { 'epel': }
11+
Class['epel'] -> Class['rabbitmq']
12+
}
713
class { 'rabbitmq':
814
port => 5672,
915
delete_guest_user => true,
1016
}
11-
if $facts['os']['family'] == 'RedHat' {
12-
class { 'erlang': epel_enable => true}
13-
Class['erlang'] -> Class['rabbitmq']
14-
}
1517
EOS
1618

1719
apply_manifest(pp, catch_failures: true)

‎spec/acceptance/parameter_spec.rb‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@
44
context 'create parameter resource' do
55
it 'runs successfully' do
66
pp = <<-EOS
7+
class { 'erlang': }
8+
Class['erlang'] -> Class['rabbitmq']
79
if $facts['os']['family'] == 'RedHat' {
8-
class { 'erlang': epel_enable => true }
9-
Class['erlang'] -> Class['rabbitmq']
10+
class { 'epel': }
11+
Class['epel'] -> Class['rabbitmq']
1012
}
1113
class { 'rabbitmq':
1214
service_manage => true,

‎spec/acceptance/policy_spec.rb‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@
44
context 'create policy resource' do
55
it 'runs successfully' do
66
pp = <<-EOS
7+
class { 'erlang': }
8+
Class['erlang'] -> Class['rabbitmq']
79
if $facts['os']['family'] == 'RedHat' {
8-
class { 'erlang': epel_enable => true }
9-
Class['erlang'] -> Class['rabbitmq']
10+
class { 'epel': }
11+
Class['epel'] -> Class['rabbitmq']
1012
}
1113
class { 'rabbitmq':
1214
service_manage => true,

‎spec/acceptance/queue_spec.rb‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@
44
context 'create binding and queue resources when using default management port' do
55
it 'runs successfully' do
66
pp = <<-EOS
7+
class { 'erlang': }
8+
Class['erlang'] -> Class['rabbitmq']
79
if $facts['os']['family'] == 'RedHat' {
8-
class { 'erlang': epel_enable => true }
9-
Class['erlang'] -> Class['rabbitmq']
10+
class { 'epel': }
11+
Class['epel'] -> Class['rabbitmq']
1012
}
1113
class { 'rabbitmq':
1214
service_manage => true,
@@ -80,9 +82,11 @@ class { 'rabbitmq':
8082
context 'create multiple bindings when same source / destination / vhost but different routing keys' do
8183
it 'runs successfully' do
8284
pp = <<-EOS
85+
class { 'erlang': }
86+
Class['erlang'] -> Class['rabbitmq']
8387
if $facts['os']['family'] == 'RedHat' {
84-
class { 'erlang': epel_enable => true }
85-
Class['erlang'] -> Class['rabbitmq']
88+
class { 'epel': }
89+
Class['epel'] -> Class['rabbitmq']
8690
}
8791
class { 'rabbitmq':
8892
service_manage => true,
@@ -170,9 +174,11 @@ class { 'rabbitmq':
170174
context 'create binding and queue resources when using a non-default management port' do
171175
it 'runs successfully' do
172176
pp = <<-EOS
177+
class { 'erlang': }
178+
Class['erlang'] -> Class['rabbitmq']
173179
if $facts['os']['family'] == 'RedHat' {
174-
class { 'erlang': epel_enable => true }
175-
Class['erlang'] -> Class['rabbitmq']
180+
class { 'epel': }
181+
Class['epel'] -> Class['rabbitmq']
176182
}
177183
class { 'rabbitmq':
178184
service_manage => true,

‎spec/acceptance/rabbitmqadmin_spec.rb‎

Lines changed: 24 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,16 @@
44
context 'downloads the cli tools' do
55
it 'runs successfully' do
66
pp = <<-EOS
7+
class { 'erlang': }
8+
Class['erlang'] -> Class['rabbitmq']
9+
if $facts['os']['family'] == 'RedHat' {
10+
class { 'epel': }
11+
Class['epel'] -> Class['rabbitmq']
12+
}
713
class { 'rabbitmq':
814
admin_enable => true,
915
service_manage => true,
1016
}
11-
if $facts['os']['family'] == 'RedHat' {
12-
class { 'erlang': epel_enable => true}
13-
Class['erlang'] -> Class['rabbitmq']
14-
}
1517
EOS
1618

1719
apply_manifest(pp, catch_failures: true)
@@ -25,14 +27,16 @@ class { 'erlang': epel_enable => true}
2527
context 'does nothing if service is unmanaged' do
2628
it 'runs successfully' do
2729
pp = <<-EOS
30+
class { 'erlang': }
31+
Class['erlang'] -> Class['rabbitmq']
32+
if $facts['os']['family'] == 'RedHat' {
33+
class { 'epel': }
34+
Class['epel'] -> Class['rabbitmq']
35+
}
2836
class { 'rabbitmq':
2937
admin_enable => true,
3038
service_manage => false,
3139
}
32-
if $facts['os']['family'] == 'RedHat' {
33-
class { 'erlang': epel_enable => true}
34-
Class['erlang'] -> Class['rabbitmq']
35-
}
3640
EOS
3741

3842
shell('rm -f /var/lib/rabbitmq/rabbitmqadmin')
@@ -48,28 +52,32 @@ class { 'erlang': epel_enable => true}
4852
it 'runs successfully' do
4953
# make sure credential change takes effect before admin_enable
5054
pp_pre = <<-EOS
55+
class { 'erlang': }
56+
Class['erlang'] -> Class['rabbitmq']
57+
if $facts['os']['family'] == 'RedHat' {
58+
class { 'epel': }
59+
Class['epel'] -> Class['rabbitmq']
60+
}
5161
class { 'rabbitmq':
5262
service_manage => true,
5363
default_user => 'foobar',
5464
default_pass => 'bazblam',
5565
}
56-
if $facts['os']['family'] == 'RedHat' {
57-
class { 'erlang': epel_enable => true}
58-
Class['erlang'] -> Class['rabbitmq']
59-
}
6066
EOS
6167

6268
pp = <<-EOS
69+
class { 'erlang': }
70+
Class['erlang'] -> Class['rabbitmq']
71+
if $facts['os']['family'] == 'RedHat' {
72+
class { 'epel': }
73+
Class['epel'] -> Class['rabbitmq']
74+
}
6375
class { 'rabbitmq':
6476
admin_enable => true,
6577
service_manage => true,
6678
default_user => 'foobar',
6779
default_pass => 'bazblam',
6880
}
69-
if $facts['os']['family'] == 'RedHat' {
70-
class { 'erlang': epel_enable => true}
71-
Class['erlang'] -> Class['rabbitmq']
72-
}
7381
EOS
7482

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

‎spec/acceptance/user_spec.rb‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@
44
context 'create user resource' do
55
it 'runs successfully' do
66
pp = <<-EOS
7+
class { 'erlang': }
8+
Class['erlang'] -> Class['rabbitmq']
79
if $facts['os']['family'] == 'RedHat' {
8-
class { 'erlang': epel_enable => true }
9-
Class['erlang'] -> Class['rabbitmq']
10+
class { 'epel': }
11+
Class['epel'] -> Class['rabbitmq']
1012
}
1113
class { 'rabbitmq':
1214
service_manage => true,

‎spec/acceptance/vhost_spec.rb‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@
44
context 'create vhost resource' do
55
it 'runs successfully' do
66
pp = <<-EOS
7+
class { 'erlang': }
8+
Class['erlang'] -> Class['rabbitmq']
79
if $facts['os']['family'] == 'RedHat' {
8-
class { 'erlang': epel_enable => true }
9-
Class['erlang'] -> Class['rabbitmq']
10+
class { 'epel': }
11+
Class['epel'] -> Class['rabbitmq']
1012
}
1113
class { 'rabbitmq':
1214
service_manage => true,

0 commit comments

Comments
 (0)