Switch back to using rabbitmq-plugins from system path (voxpupuli#566)

wyardley · Sep 1, 2017 · 6310fa6 · 6310fa6
1 parent c546593
commit 6310fa6
Showing 1 changed file with 3 additions and 13 deletions.
diff --git a/lib/puppet/provider/rabbitmq_plugin/rabbitmqplugins.rb b/lib/puppet/provider/rabbitmq_plugin/rabbitmqplugins.rb
@@ -1,20 +1,10 @@
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'rabbitmqctl'))
 Puppet::Type.type(:rabbitmq_plugin).provide(:rabbitmqplugins, parent: Puppet::Provider::Rabbitmqctl) do
   if Puppet::PUPPETVERSION.to_f < 3
-    if Facter.value(:osfamily) == 'RedHat'
-      commands rabbitmqplugins: '/usr/lib/rabbitmq/bin/rabbitmq-plugins'
-    else
-      commands rabbitmqplugins: 'rabbitmq-plugins'
-    end
+    commands :rabbitmqplugins => 'rabbitmq-plugins'
   else
-    if Facter.value(:osfamily) == 'RedHat'
-      has_command(:rabbitmqplugins, '/usr/lib/rabbitmq/bin/rabbitmq-plugins') do
-        environment HOME: '/tmp'
-      end
-    else
-      has_command(:rabbitmqplugins, 'rabbitmq-plugins') do
-        environment HOME: '/tmp'
-      end
+    has_command(:rabbitmqplugins, 'rabbitmq-plugins') do
+      environment :HOME => "/tmp"
     end
   end