Skip to content

Commit 42703a8

Browse files
wyardleykajinamit
wyardley
authored and
kajinamit
committed
Additional fixes for new version
1 parent c81d4b1 commit 42703a8

13 files changed

+22
-25
lines changed

‎data/common.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ rabbitmq::repo_gpg_key: ~
3131
rabbitmq::package_name: 'rabbitmq'
3232
rabbitmq::package_source: ~
3333
rabbitmq::package_provider: ~
34-
rabbitmq::repos_ensure: false
3534
rabbitmq::manage_python: true
3635
rabbitmq::python_package: 'python'
3736
rabbitmq::rabbitmq_user: 'rabbitmq'

‎examples/full.pp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
class { 'rabbitmq':
22
delete_guest_user => true,
3-
repos_ensure => true,
43
package_apt_pin => 900,
54
}
65

‎spec/acceptance/class_spec.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
context 'default class inclusion' do
1616
let(:pp) do
1717
<<-EOS
18-
class { 'erlang': repo_source => 'packagecloud' } ->
18+
class { 'erlang': } ->
1919
class { 'rabbitmq': }
2020
EOS
2121
end
@@ -48,7 +48,7 @@ class { 'rabbitmq': }
4848
context 'disable and stop service' do
4949
let(:pp) do
5050
<<-EOS
51-
class { 'erlang': repo_source => 'packagecloud' } ->
51+
class { 'erlang': } ->
5252
class { 'rabbitmq':
5353
service_ensure => 'stopped',
5454
}
@@ -66,12 +66,12 @@ class { 'rabbitmq':
6666
context 'service is unmanaged' do
6767
it 'runs successfully' do
6868
pp_pre = <<-EOS
69-
class { 'erlang': repo_source => 'packagecloud' } ->
69+
class { 'erlang': } ->
7070
class { 'rabbitmq': }
7171
EOS
7272

7373
pp = <<-EOS
74-
class { 'erlang': repo_source => 'packagecloud' } ->
74+
class { 'erlang': } ->
7575
class { 'rabbitmq':
7676
service_manage => false,
7777
service_ensure => 'stopped',

‎spec/acceptance/clustering_spec.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
context 'rabbitmq::wipe_db_on_cookie_change => false' do
77
it 'runs successfully' do
88
pp = <<-EOS
9-
class { 'erlang': repo_source => 'packagecloud' } ->
9+
class { 'erlang': } ->
1010
class { 'rabbitmq':
1111
cluster => { 'name' => 'rabbit_cluster', 'init_node' => $facts['fqdn'] },
1212
config_cluster => true,
@@ -28,7 +28,7 @@ class { 'rabbitmq':
2828
context 'rabbitmq::wipe_db_on_cookie_change => true' do
2929
it 'runs successfully' do
3030
pp = <<-EOS
31-
class { 'erlang': repo_source => 'packagecloud' } ->
31+
class { 'erlang': } ->
3232
class { 'rabbitmq':
3333
cluster => { 'name' => 'rabbit_cluster', 'init_node' => $facts['fqdn'] },
3434
config_cluster => true,
@@ -70,7 +70,7 @@ class { 'rabbitmq':
7070
context 'rabbitmq::cluster[:local_node] = foobar' do
7171
it 'runs successfully' do
7272
pp = <<-EOS
73-
class { 'erlang': repo_source => 'packagecloud' } ->
73+
class { 'erlang': } ->
7474
class { 'rabbitmq':
7575
cluster => { 'name' => 'rabbit_cluster', 'init_node' => 'foobar', 'local_node' => 'foobar' },
7676
config_cluster => true,

‎spec/acceptance/delete_guest_user_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
context 'delete_guest_user' do
77
it 'runs successfully' do
88
pp = <<-EOS
9-
class { 'erlang': repo_source => 'packagecloud' } ->
9+
class { 'erlang': } ->
1010
class { 'rabbitmq':
1111
port => 5672,
1212
delete_guest_user => true,

‎spec/acceptance/parameter_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
context 'create parameter resource' do
77
it 'runs successfully' do
88
pp = <<-EOS
9-
class { 'erlang': repo_source => 'packagecloud' } ->
9+
class { 'erlang': } ->
1010
class { 'rabbitmq':
1111
service_manage => true,
1212
port => 5672,

‎spec/acceptance/policy_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
context 'create policy resource' do
77
it 'runs successfully' do
88
pp = <<-EOS
9-
class { 'erlang': repo_source => 'packagecloud' } ->
9+
class { 'erlang': } ->
1010
class { 'rabbitmq':
1111
service_manage => true,
1212
port => 5672,

‎spec/acceptance/queue_spec.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
context 'create binding and queue resources when using default management port' do
77
it 'runs successfully' do
88
pp = <<-EOS
9-
class { 'erlang': repo_source => 'packagecloud' } ->
9+
class { 'erlang': } ->
1010
class { 'rabbitmq':
1111
service_manage => true,
1212
port => 5672,
@@ -77,7 +77,7 @@ class { 'rabbitmq':
7777
context 'create multiple bindings when same source / destination / vhost but different routing keys' do
7878
it 'runs successfully' do
7979
pp = <<-EOS
80-
class { 'erlang': repo_source => 'packagecloud' } ->
80+
class { 'erlang': } ->
8181
class { 'rabbitmq':
8282
service_manage => true,
8383
port => 5672,
@@ -162,7 +162,7 @@ class { 'rabbitmq':
162162
context 'create binding and queue resources when using a non-default management port' do
163163
it 'runs successfully' do
164164
pp = <<-EOS
165-
class { 'erlang': repo_source => 'packagecloud' } ->
165+
class { 'erlang': } ->
166166
class { 'rabbitmq':
167167
service_manage => true,
168168
port => 5672,

‎spec/acceptance/rabbitmqadmin_spec.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
context 'downloads the cli tools' do
77
it 'runs successfully' do
88
pp = <<-EOS
9-
class { 'erlang': repo_source => 'packagecloud' } ->
9+
class { 'erlang': } ->
1010
class { 'rabbitmq':
1111
admin_enable => true,
1212
service_manage => true,
@@ -24,7 +24,7 @@ class { 'rabbitmq':
2424
context 'does nothing if service is unmanaged' do
2525
it 'runs successfully' do
2626
pp = <<-EOS
27-
class { 'erlang': repo_source => 'packagecloud' } ->
27+
class { 'erlang': } ->
2828
class { 'rabbitmq':
2929
admin_enable => true,
3030
service_manage => false,
@@ -44,7 +44,7 @@ class { 'rabbitmq':
4444
it 'runs successfully' do
4545
# make sure credential change takes effect before admin_enable
4646
pp_pre = <<-EOS
47-
class { 'erlang': repo_source => 'packagecloud' } ->
47+
class { 'erlang': } ->
4848
class { 'rabbitmq':
4949
service_manage => true,
5050
default_user => 'foobar',
@@ -53,7 +53,7 @@ class { 'rabbitmq':
5353
EOS
5454

5555
pp = <<-EOS
56-
class { 'erlang': repo_source => 'packagecloud' } ->
56+
class { 'erlang': } ->
5757
class { 'rabbitmq':
5858
admin_enable => true,
5959
service_manage => true,

‎spec/acceptance/user_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
context 'create user resource' do
77
it 'runs successfully' do
88
pp = <<-EOS
9-
class { 'erlang': repo_source => 'packagecloud' } ->
9+
class { 'erlang': } ->
1010
class { 'rabbitmq':
1111
service_manage => true,
1212
port => 5672,

‎spec/acceptance/vhost_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
context 'create vhost resource' do
77
it 'runs successfully' do
88
pp = <<-EOS
9-
class { 'erlang': repo_source => 'packagecloud' } ->
9+
class { 'erlang': } ->
1010
class { 'rabbitmq':
1111
service_manage => true,
1212
port => 5672,

‎spec/classes/rabbitmq_spec.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,8 @@
234234
is_expected.to contain_archive('rabbitmqadmin').with_source('http://1.1.1.1:15672/cli/rabbitmqadmin')
235235
end
236236

237-
it { is_expected.to contain_package('python') } if %w[RedHat Debian SUSE Archlinux].include?(os_facts[:os]['family'])
237+
it { is_expected.to contain_package('python') } if %w[Debian SUSE Archlinux].include?(os_facts[:os]['family'])
238+
it { is_expected.to contain_package('python3') } if %w[RedHat].include?(os_facts[:os]['family'])
238239
it { is_expected.to contain_package('python38') } if %w[FreeBSD].include?(os_facts[:os]['family'])
239240
end
240241

‎spec/spec_helper_acceptance.rb

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,9 @@
33
require 'voxpupuli/acceptance/spec_helper_acceptance'
44

55
configure_beaker do |host|
6-
install_module_from_forge_on(host, 'puppet-erlang', '>= 1.0.0 < 2.0.0')
6+
install_module_from_forge_on(host, 'puppet-erlang', '>= 1.1.0 < 2.0.0')
77

88
case fact_on(host, 'os.family')
9-
when 'Debian'
10-
install_module_from_forge_on(host, 'puppetlabs-apt', '>= 4.1.0 < 9.0.0')
119
when 'RedHat'
1210
if fact_on(host, 'os.selinux.enabled')
1311
# Make sure selinux is disabled so the tests work.

0 commit comments

Comments
 (0)