From f8e55977cf414e3e47160e1dcec2749089728743 Mon Sep 17 00:00:00 2001 From: William Yardley Date: Sat, 26 Aug 2017 00:44:10 -0700 Subject: [PATCH] Switch back to using rabbitmq-plugins from system path, drop Puppet 3 conditional (#566) --- .../provider/rabbitmq_plugin/rabbitmqplugins.rb | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/puppet/provider/rabbitmq_plugin/rabbitmqplugins.rb b/lib/puppet/provider/rabbitmq_plugin/rabbitmqplugins.rb index 543afc027..84e20fc08 100644 --- a/lib/puppet/provider/rabbitmq_plugin/rabbitmqplugins.rb +++ b/lib/puppet/provider/rabbitmq_plugin/rabbitmqplugins.rb @@ -1,10 +1,14 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'rabbitmqctl')) Puppet::Type.type(:rabbitmq_plugin).provide(:rabbitmqplugins, parent: Puppet::Provider::Rabbitmqctl) do - case Facter.value(:osfamily) - when 'RedHat' - has_command(:rabbitmqplugins, '/usr/lib/rabbitmq/bin/rabbitmq-plugins') { environment HOME: '/tmp' } + # Prefer rabbitmq-plugins if it's in $PATH, but fall back to /usr/lib/rabbitmq/bin + if Puppet::Util.which('rabbitmq-plugins') + has_command(:rabbitmqplugins, 'rabbitmq-plugins') do + environment HOME: '/tmp' + end else - has_command(:rabbitmqplugins, 'rabbitmq-plugins') { environment HOME: '/tmp' } + has_command(:rabbitmqplugins, '/usr/lib/rabbitmq/bin/rabbitmq-plugins') do + environment HOME: '/tmp' + end end defaultfor feature: :posix