Skip to content

Commit

Permalink
Use default install method on Archlinux (#905)
Browse files Browse the repository at this point in the history
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
  • Loading branch information
wyardley committed Nov 14, 2024
1 parent a3f7f8c commit 7f77f3c
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 15 deletions.
3 changes: 1 addition & 2 deletions data/family/Archlinux.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
---
rabbitmq::python_package: 'python2'
rabbitmq::rabbitmqadmin_package: 'rabbitmqadmin'
rabbitmq::python_package: 'python'
21 changes: 8 additions & 13 deletions spec/classes/rabbitmq_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -231,20 +231,15 @@
end
end

if facts[:os]['family'] == 'Archlinux'
it 'installs a package called rabbitmqadmin' do
is_expected.to contain_package('rabbitmqadmin').with_name('rabbitmqadmin')
end
else
it 'we enable the admin interface by default' do
is_expected.to contain_class('rabbitmq::install::rabbitmqadmin')
is_expected.to contain_rabbitmq_plugin('rabbitmq_management').with(
notify: 'Class[Rabbitmq::Service]'
)
is_expected.to contain_archive('rabbitmqadmin').with_source('http://1.1.1.1:15672/cli/rabbitmqadmin')
end
it 'we enable the admin interface by default' do
is_expected.to contain_class('rabbitmq::install::rabbitmqadmin')
is_expected.to contain_rabbitmq_plugin('rabbitmq_management').with(
notify: 'Class[Rabbitmq::Service]'
)
is_expected.to contain_archive('rabbitmqadmin').with_source('http://1.1.1.1:15672/cli/rabbitmqadmin')
end
it { is_expected.to contain_package('python') } if %w[RedHat Debian SUSE].include?(facts[:os]['family'])

it { is_expected.to contain_package('python') } if %w[RedHat Debian SUSE Archlinux].include?(facts[:os]['family'])
it { is_expected.to contain_package('python2') } if %w[FreeBSD OpenBSD].include?(facts[:os]['family'])
end

Expand Down

0 comments on commit 7f77f3c

Please sign in to comment.