Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Sep 13, 2017
Merged

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions lib/puppet/provider/rabbitmq_plugin/rabbitmqplugins.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did try manipulating PATH directly, but didn't have any luck when doing actual tests with it.

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
Expand Down