Skip to content

Commit 20465de

Browse files
nmaludynmaludy
committed
Switch to voxpupuli erlang module
1 parent 24a745b commit 20465de

File tree

11 files changed

+51
-77
lines changed

11 files changed

+51
-77
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: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,9 @@
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+
class { 'rabbitmq': }
2725
EOS
2826
end
2927

@@ -55,13 +53,9 @@ class { 'erlang': epel_enable => true}
5553
context 'disable and stop service' do
5654
let(:pp) do
5755
<<-EOS
58-
class { 'rabbitmq':
59-
service_ensure => 'stopped',
60-
}
61-
if $facts['os']['family'] == 'RedHat' {
62-
class { 'erlang': epel_enable => true}
63-
Class['erlang'] -> Class['rabbitmq']
64-
}
56+
class { 'erlang': }
57+
Class['erlang'] -> Class['rabbitmq']
58+
class { 'rabbitmq': }
6559
EOS
6660
end
6761

@@ -76,22 +70,18 @@ class { 'erlang': epel_enable => true}
7670
context 'service is unmanaged' do
7771
it 'runs successfully' do
7872
pp_pre = <<-EOS
73+
class { 'erlang': }
74+
Class['erlang'] -> Class['rabbitmq']
7975
class { 'rabbitmq': }
80-
if $facts['os']['family'] == 'RedHat' {
81-
class { 'erlang': epel_enable => true}
82-
Class['erlang'] -> Class['rabbitmq']
83-
}
8476
EOS
8577

8678
pp = <<-EOS
79+
class { 'erlang': }
80+
Class['erlang'] -> Class['rabbitmq']
8781
class { 'rabbitmq':
8882
service_manage => false,
8983
service_ensure => 'stopped',
9084
}
91-
if $facts['os']['family'] == 'RedHat' {
92-
class { 'erlang': epel_enable => true}
93-
Class['erlang'] -> Class['rabbitmq']
94-
}
9585
EOS
9686

9787
apply_manifest(pp_pre, catch_failures: true)
@@ -107,6 +97,8 @@ class { 'erlang': epel_enable => true}
10797
context 'binding on all interfaces' do
10898
let(:pp) do
10999
<<-EOS
100+
class { 'erlang': }
101+
Class['erlang'] -> Class['rabbitmq']
110102
class { 'rabbitmq':
111103
service_manage => true,
112104
port => 5672,
@@ -137,6 +129,8 @@ class { 'rabbitmq':
137129
context 'binding to localhost only' do
138130
let(:pp) do
139131
<<-EOS
132+
class { 'erlang': }
133+
Class['erlang'] -> Class['rabbitmq']
140134
class { 'rabbitmq':
141135
service_manage => true,
142136
port => 5672,
@@ -168,6 +162,8 @@ class { 'rabbitmq':
168162
context 'ssl enabled' do
169163
let(:pp) do
170164
<<-EOS
165+
class { 'erlang': }
166+
Class['erlang'] -> Class['rabbitmq']
171167
class { 'rabbitmq':
172168
service_manage => true,
173169
admin_enable => true,
@@ -197,6 +193,8 @@ class { 'rabbitmq':
197193
context 'different management_ip_address and node_ip_address' do
198194
let(:pp) do
199195
<<-EOS
196+
class { 'erlang': }
197+
Class['erlang'] -> Class['rabbitmq']
200198
class { 'rabbitmq':
201199
service_manage => true,
202200
port => 5672,

‎spec/acceptance/clustering_spec.rb‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,15 @@
44
context 'rabbitmq::wipe_db_on_cookie_change => false' do
55
it 'runs successfully' do
66
pp = <<-EOS
7+
class { 'erlang': }
78
class { 'rabbitmq':
89
config_cluster => true,
910
cluster_nodes => ['rabbit1', 'rabbit2'],
1011
cluster_node_type => 'ram',
1112
erlang_cookie => 'TESTCOOKIE',
1213
wipe_db_on_cookie_change => false,
1314
}
14-
if $facts['os']['family'] == 'RedHat' {
15-
class { 'erlang': epel_enable => true}
16-
Class['erlang'] -> Class['rabbitmq']
17-
}
15+
Class['erlang'] -> Class['rabbitmq']
1816
EOS
1917

2018
apply_manifest(pp, expect_failures: true)
@@ -27,17 +25,15 @@ class { 'erlang': epel_enable => true}
2725
context 'rabbitmq::wipe_db_on_cookie_change => true' do
2826
it 'runs successfully' do
2927
pp = <<-EOS
28+
class { 'erlang': }
3029
class { 'rabbitmq':
3130
config_cluster => true,
3231
cluster_nodes => ['rabbit1', 'rabbit2'],
3332
cluster_node_type => 'ram',
3433
erlang_cookie => 'TESTCOOKIE',
3534
wipe_db_on_cookie_change => true,
3635
}
37-
if $facts['os']['family'] == 'RedHat' {
38-
class { 'erlang': epel_enable => true}
39-
Class['erlang'] -> Class['rabbitmq']
40-
}
36+
Class['erlang'] -> Class['rabbitmq']
4137
EOS
4238

4339
apply_manifest(pp, catch_failures: true)

‎spec/acceptance/delete_guest_user_spec.rb‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,12 @@
44
context 'delete_guest_user' do
55
it 'runs successfully' do
66
pp = <<-EOS
7+
class { 'erlang': }
78
class { 'rabbitmq':
89
port => 5672,
910
delete_guest_user => true,
1011
}
11-
if $facts['os']['family'] == 'RedHat' {
12-
class { 'erlang': epel_enable => true}
13-
Class['erlang'] -> Class['rabbitmq']
14-
}
12+
Class['erlang'] -> Class['rabbitmq']
1513
EOS
1614

1715
apply_manifest(pp, catch_failures: true)

‎spec/acceptance/parameter_spec.rb‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,8 @@
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']
10-
}
7+
class { 'erlang': }
8+
Class['erlang'] -> Class['rabbitmq']
119
class { 'rabbitmq':
1210
service_manage => true,
1311
port => 5672,

‎spec/acceptance/policy_spec.rb‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,8 @@
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']
10-
}
7+
class { 'erlang': }
8+
Class['erlang'] -> Class['rabbitmq']
119
class { 'rabbitmq':
1210
service_manage => true,
1311
port => 5672,

‎spec/acceptance/queue_spec.rb‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,8 @@
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']
10-
}
7+
class { 'erlang': }
8+
Class['erlang'] -> Class['rabbitmq']
119
class { 'rabbitmq':
1210
service_manage => true,
1311
port => 5672,
@@ -80,10 +78,8 @@ class { 'rabbitmq':
8078
context 'create multiple bindings when same source / destination / vhost but different routing keys' do
8179
it 'runs successfully' do
8280
pp = <<-EOS
83-
if $facts['os']['family'] == 'RedHat' {
84-
class { 'erlang': epel_enable => true }
85-
Class['erlang'] -> Class['rabbitmq']
86-
}
81+
class { 'erlang': }
82+
Class['erlang'] -> Class['rabbitmq']
8783
class { 'rabbitmq':
8884
service_manage => true,
8985
port => 5672,
@@ -170,10 +166,8 @@ class { 'rabbitmq':
170166
context 'create binding and queue resources when using a non-default management port' do
171167
it 'runs successfully' do
172168
pp = <<-EOS
173-
if $facts['os']['family'] == 'RedHat' {
174-
class { 'erlang': epel_enable => true }
175-
Class['erlang'] -> Class['rabbitmq']
176-
}
169+
class { 'erlang': }
170+
Class['erlang'] -> Class['rabbitmq']
177171
class { 'rabbitmq':
178172
service_manage => true,
179173
port => 5672,

‎spec/acceptance/rabbitmqadmin_spec.rb‎

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,12 @@
44
context 'downloads the cli tools' do
55
it 'runs successfully' do
66
pp = <<-EOS
7+
class { 'erlang': }
8+
Class['erlang'] -> Class['rabbitmq']
79
class { 'rabbitmq':
810
admin_enable => true,
911
service_manage => true,
1012
}
11-
if $facts['os']['family'] == 'RedHat' {
12-
class { 'erlang': epel_enable => true}
13-
Class['erlang'] -> Class['rabbitmq']
14-
}
1513
EOS
1614

1715
apply_manifest(pp, catch_failures: true)
@@ -25,14 +23,12 @@ class { 'erlang': epel_enable => true}
2523
context 'does nothing if service is unmanaged' do
2624
it 'runs successfully' do
2725
pp = <<-EOS
26+
class { 'erlang': }
27+
Class['erlang'] -> Class['rabbitmq']
2828
class { 'rabbitmq':
2929
admin_enable => true,
3030
service_manage => false,
3131
}
32-
if $facts['os']['family'] == 'RedHat' {
33-
class { 'erlang': epel_enable => true}
34-
Class['erlang'] -> Class['rabbitmq']
35-
}
3632
EOS
3733

3834
shell('rm -f /var/lib/rabbitmq/rabbitmqadmin')
@@ -48,28 +44,24 @@ class { 'erlang': epel_enable => true}
4844
it 'runs successfully' do
4945
# make sure credential change takes effect before admin_enable
5046
pp_pre = <<-EOS
47+
class { 'erlang': }
48+
Class['erlang'] -> Class['rabbitmq']
5149
class { 'rabbitmq':
5250
service_manage => true,
5351
default_user => 'foobar',
5452
default_pass => 'bazblam',
5553
}
56-
if $facts['os']['family'] == 'RedHat' {
57-
class { 'erlang': epel_enable => true}
58-
Class['erlang'] -> Class['rabbitmq']
59-
}
6054
EOS
6155

6256
pp = <<-EOS
57+
class { 'erlang': }
58+
Class['erlang'] -> Class['rabbitmq']
6359
class { 'rabbitmq':
6460
admin_enable => true,
6561
service_manage => true,
6662
default_user => 'foobar',
6763
default_pass => 'bazblam',
6864
}
69-
if $facts['os']['family'] == 'RedHat' {
70-
class { 'erlang': epel_enable => true}
71-
Class['erlang'] -> Class['rabbitmq']
72-
}
7365
EOS
7466

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

‎spec/acceptance/user_spec.rb‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,8 @@
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']
10-
}
7+
class { 'erlang': }
8+
Class['erlang'] -> Class['rabbitmq']
119
class { 'rabbitmq':
1210
service_manage => true,
1311
port => 5672,

‎spec/acceptance/vhost_spec.rb‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,8 @@
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']
10-
}
7+
class { 'erlang': }
8+
Class['erlang'] -> Class['rabbitmq']
119
class { 'rabbitmq':
1210
service_manage => true,
1311
port => 5672,

0 commit comments

Comments
 (0)