Skip to content

Commit 015bd78

Browse files
committed
Merge pull request voxpupuli#140 from robocoder/manage-repos-patch
manage_repos
2 parents 0e30a57 + 6b8c64a commit 015bd78

File tree

3 files changed

+30
-8
lines changed

3 files changed

+30
-8
lines changed

manifests/init.pp

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
$package_name = $rabbitmq::params::package_name,
2525
$package_provider = $rabbitmq::params::package_provider,
2626
$package_source = $rabbitmq::params::package_source,
27+
$manage_repos = $rabbitmq::params::manage_repos,
2728
$plugin_dir = $rabbitmq::params::plugin_dir,
2829
$port = $rabbitmq::params::port,
2930
$service_ensure = $rabbitmq::params::service_ensure,
@@ -60,6 +61,7 @@
6061
validate_string($package_name)
6162
validate_string($package_provider)
6263
validate_string($package_source)
64+
validate_bool($manage_repos)
6365
validate_re($version, '^\d+\.\d+\.\d+(-\d+)*$') # Allow 3 digits and optional -n postfix.
6466
# Validate config parameters.
6567
validate_array($cluster_disk_nodes)
@@ -110,13 +112,15 @@
110112
include '::rabbitmq::service'
111113
include '::rabbitmq::management'
112114

113-
case $::osfamily {
114-
'RedHat', 'SUSE':
115-
{ include '::rabbitmq::repo::rhel' }
116-
'Debian':
117-
{ include '::rabbitmq::repo::apt' }
118-
default:
119-
{ }
115+
if $rabbitmq::manage_repos == true {
116+
case $::osfamily {
117+
'RedHat', 'SUSE':
118+
{ include '::rabbitmq::repo::rhel' }
119+
'Debian':
120+
{ include '::rabbitmq::repo::apt' }
121+
default:
122+
{ }
123+
}
120124
}
121125

122126
if $admin_enable and $service_manage {

manifests/params.pp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
$management_port = '15672'
4343
$package_apt_pin = ''
4444
$package_gpg_key = 'http://www.rabbitmq.com/rabbitmq-signing-key-public.asc'
45+
$manage_repos = true
4546
$service_ensure = 'running'
4647
$service_manage = true
4748
#config

spec/classes/rabbitmq_spec.rb

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,30 @@
3636
end
3737
end
3838
end
39+
40+
context 'on Debian' do
41+
let(:params) {{ :manage_repos => false }}
42+
let(:facts) {{ :osfamily => 'Debian', :lsbdistcodename => 'squeeze' }}
43+
it 'does not include rabbitmq::repo::apt when manage_repos is false' do
44+
should_not contain_class('rabbitmq::repo::apt')
45+
end
46+
end
47+
3948
context 'on Redhat' do
4049
let(:facts) {{ :osfamily => 'RedHat' }}
4150
it 'includes rabbitmq::repo::rhel' do
4251
should contain_class('rabbitmq::repo::rhel')
4352
end
4453
end
45-
54+
55+
context 'on Redhat' do
56+
let(:params) {{ :manage_repos => false }}
57+
let(:facts) {{ :osfamily => 'RedHat' }}
58+
it 'does not include rabbitmq::repo::rhel when manage_repos is false' do
59+
should_not contain_class('rabbitmq::repo::rhel')
60+
end
61+
end
62+
4663
['Debian', 'RedHat', 'SUSE', 'Archlinux'].each do |distro|
4764
context "on #{distro}" do
4865
let(:facts) {{

0 commit comments

Comments
 (0)