X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Frabbitmq%2Flib%2Fpuppet%2Ftype%2Frabbitmq_exchange.rb;h=4f274f2adc43fbedc01c6fc96f561a37b5709de5;hb=94a8783f522bbf2996cb8a59b977dea583e8b0c7;hp=b2e88a8de0c2b6c24d32cbc5654be925b99ae99d;hpb=e107504bce7d9b21cc301124fc7c39fdb0762374;p=mirror%2Fdsa-puppet.git

diff --git a/3rdparty/modules/rabbitmq/lib/puppet/type/rabbitmq_exchange.rb b/3rdparty/modules/rabbitmq/lib/puppet/type/rabbitmq_exchange.rb
index b2e88a8de..4f274f2ad 100644
--- a/3rdparty/modules/rabbitmq/lib/puppet/type/rabbitmq_exchange.rb
+++ b/3rdparty/modules/rabbitmq/lib/puppet/type/rabbitmq_exchange.rb
@@ -1,5 +1,21 @@
 Puppet::Type.newtype(:rabbitmq_exchange) do
-  desc 'Native type for managing rabbitmq exchanges'
+  desc <<-DESC
+Native type for managing rabbitmq exchanges
+
+@example Create a rabbitmq_exchange
+ rabbitmq_exchange { 'myexchange@myvhost':
+   user        => 'dan',
+   password    => 'bar',
+   type        => 'topic',
+   ensure      => present,
+   internal    => false,
+   auto_delete => false,
+   durable     => true,
+   arguments   => {
+     hash-header => 'message-distribution-hash'
+   }
+ }
+DESC
 
   ensurable do
     defaultto(:present)
@@ -11,29 +27,32 @@ Puppet::Type.newtype(:rabbitmq_exchange) do
     end
   end
 
-  newparam(:name, :namevar => true) do
+  newparam(:name, namevar: true) do
     desc 'Name of exchange'
-    newvalues(/^\S*@\S+$/)
+    newvalues(%r{^\S*@\S+$})
   end
 
   newparam(:type) do
     desc 'Exchange type to be set *on creation*'
-    newvalues(/^\S+$/)
+    newvalues(%r{^\S+$})
   end
 
   newparam(:durable) do
     desc 'Exchange durability to be set *on creation*'
-    newvalues(/^\S+$/)
+    newvalues(%r{^\S+$})
+    defaultto 'false'
   end
 
   newparam(:auto_delete) do
     desc 'Exchange auto delete option to be set *on creation*'
-    newvalues(/^\S+$/)
+    newvalues(%r{^\S+$})
+    defaultto 'false'
   end
 
   newparam(:internal) do
     desc 'Exchange internal option to be set *on creation*'
-    newvalues(/^\S+$/)
+    newvalues(%r{^\S+$})
+    defaultto 'false'
   end
 
   newparam(:arguments) do
@@ -44,17 +63,17 @@ Puppet::Type.newtype(:rabbitmq_exchange) do
   newparam(:user) do
     desc 'The user to use to connect to rabbitmq'
     defaultto('guest')
-    newvalues(/^\S+$/)
+    newvalues(%r{^\S+$})
   end
 
   newparam(:password) do
     desc 'The password to use to connect to rabbitmq'
     defaultto('guest')
-    newvalues(/\S+/)
+    newvalues(%r{\S+})
   end
 
   validate do
-    if self[:ensure] == :present and self[:type].nil?
+    if self[:ensure] == :present && self[:type].nil?
       raise ArgumentError, "must set type when creating exchange for #{self[:name]} whose type is #{self[:type]}"
     end
   end
@@ -70,5 +89,4 @@ Puppet::Type.newtype(:rabbitmq_exchange) do
   autorequire(:rabbitmq_user_permissions) do
     ["#{self[:user]}@#{self[:name].split('@')[1]}"]
   end
-
 end