Merge pull request voxpupuli#96 from apenney/providers

Replace confines with autorequire.

lib/puppet/provider/rabbitmq_user/rabbitmqctl.rb

@@ -10,14 +10,6 @@
   end
 
   defaultfor :feature => :posix
-  confine :false =>
-  begin
-    rabbitmqctl('list_users', '-q').find {|line|
-      line =~ /unable to connect to node/
-    }
-  rescue Puppet::Error => error
-    true
-  end
 
   def self.instances
     rabbitmqctl('list_users').split(/\n/)[1..-2].collect do |line|

lib/puppet/provider/rabbitmq_user_permissions/rabbitmqctl.rb

@@ -9,14 +9,6 @@
   end
 
   defaultfor :feature=> :posix
-  confine :false =>
-  begin
-    rabbitmqctl('list_users', '-q').find {|line|
-      line =~ /unable to connect to node/
-    }
-  rescue Puppet::Error => error
-    true
-  end
 
   # cache users permissions
   def self.users(name, vhost)

lib/puppet/type/rabbitmq_user.rb

@@ -11,6 +11,8 @@
     end
   end
 
+  autorequire(:service) { 'rabbitmq-server' }
+
   newparam(:name, :namevar => true) do
     desc 'Name of user'
     newvalues(/^\S+$/)

lib/puppet/type/rabbitmq_user_permissions.rb

@@ -11,8 +11,10 @@
     end
   end
 
+  autorequire(:service) { 'rabbitmq-server' }
+
   newparam(:name, :namevar => true) do
-    'combination of user@vhost to grant privileges to'
+    desc 'combination of user@vhost to grant privileges to'
     newvalues(/^\S+@\S+$/)
   end
 

manifests/init.pp

@@ -131,7 +131,5 @@
   # Make sure the various providers have their requirements in place.
   Class['::rabbitmq::install'] -> Rabbitmq_plugin<| |>
   Class['::rabbitmq::install::rabbitmqadmin'] -> Rabbitmq_exchange<| |>
-  Class['::rabbitmq::service'] -> Rabbitmq_user<| |>
-  Class['::rabbitmq::service'] -> Rabbitmq_user_permissions<| |>
 
 }