Skip to content

Commit e259d5b

Browse files
authored
Use default install method on Archlinux (#905)
Update Python package name to python instead of python2, and use file install vs. package install by default Partially rolls back #654, though continues to allow the user to set the package via $rabbitmqadmin_package
1 parent a61d23a commit e259d5b

File tree

2 files changed

+9
-15
lines changed

2 files changed

+9
-15
lines changed

data/family/Archlinux.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
---
2-
rabbitmq::python_package: 'python2'
3-
rabbitmq::rabbitmqadmin_package: 'rabbitmqadmin'
2+
rabbitmq::python_package: 'python'

spec/classes/rabbitmq_spec.rb

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -231,20 +231,15 @@
231231
end
232232
end
233233

234-
if facts[:os]['family'] == 'Archlinux'
235-
it 'installs a package called rabbitmqadmin' do
236-
is_expected.to contain_package('rabbitmqadmin').with_name('rabbitmqadmin')
237-
end
238-
else
239-
it 'we enable the admin interface by default' do
240-
is_expected.to contain_class('rabbitmq::install::rabbitmqadmin')
241-
is_expected.to contain_rabbitmq_plugin('rabbitmq_management').with(
242-
notify: 'Class[Rabbitmq::Service]'
243-
)
244-
is_expected.to contain_archive('rabbitmqadmin').with_source('http://1.1.1.1:15672/cli/rabbitmqadmin')
245-
end
234+
it 'we enable the admin interface by default' do
235+
is_expected.to contain_class('rabbitmq::install::rabbitmqadmin')
236+
is_expected.to contain_rabbitmq_plugin('rabbitmq_management').with(
237+
notify: 'Class[Rabbitmq::Service]'
238+
)
239+
is_expected.to contain_archive('rabbitmqadmin').with_source('http://1.1.1.1:15672/cli/rabbitmqadmin')
246240
end
247-
it { is_expected.to contain_package('python') } if %w[RedHat Debian SUSE].include?(facts[:os]['family'])
241+
242+
it { is_expected.to contain_package('python') } if %w[RedHat Debian SUSE Archlinux].include?(facts[:os]['family'])
248243
it { is_expected.to contain_package('python2') } if %w[FreeBSD OpenBSD].include?(facts[:os]['family'])
249244
end
250245

0 commit comments

Comments
 (0)