diff --git a/data/family/Archlinux.yaml b/data/family/Archlinux.yaml index 62f41ffe8..3613ab2bc 100644 --- a/data/family/Archlinux.yaml +++ b/data/family/Archlinux.yaml @@ -1,3 +1,2 @@ --- -rabbitmq::python_package: 'python2' -rabbitmq::rabbitmqadmin_package: 'rabbitmqadmin' +rabbitmq::python_package: 'python' diff --git a/spec/classes/rabbitmq_spec.rb b/spec/classes/rabbitmq_spec.rb index 4e59032e3..15ab2a204 100644 --- a/spec/classes/rabbitmq_spec.rb +++ b/spec/classes/rabbitmq_spec.rb @@ -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