X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Frabbitmq%2Flib%2Fpuppet%2Ftype%2Frabbitmq_exchange.rb;fp=3rdparty%2Fmodules%2Frabbitmq%2Flib%2Fpuppet%2Ftype%2Frabbitmq_exchange.rb;h=b2e88a8de0c2b6c24d32cbc5654be925b99ae99d;hb=24caa46729f80fbba4be8b9b26ebcb3acc4cb0fb;hp=4f274f2adc43fbedc01c6fc96f561a37b5709de5;hpb=c7e7bcc28cc5dc48a7e284a3c82f33df27d1f57d;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 4f274f2ad..b2e88a8de 100644
--- a/3rdparty/modules/rabbitmq/lib/puppet/type/rabbitmq_exchange.rb
+++ b/3rdparty/modules/rabbitmq/lib/puppet/type/rabbitmq_exchange.rb
@@ -1,21 +1,5 @@
 Puppet::Type.newtype(:rabbitmq_exchange) do
-  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
+  desc 'Native type for managing rabbitmq exchanges'
 
   ensurable do
     defaultto(:present)
@@ -27,32 +11,29 @@ DESC
     end
   end
 
-  newparam(:name, namevar: true) do
+  newparam(:name, :namevar => true) do
     desc 'Name of exchange'
-    newvalues(%r{^\S*@\S+$})
+    newvalues(/^\S*@\S+$/)
   end
 
   newparam(:type) do
     desc 'Exchange type to be set *on creation*'
-    newvalues(%r{^\S+$})
+    newvalues(/^\S+$/)
   end
 
   newparam(:durable) do
     desc 'Exchange durability to be set *on creation*'
-    newvalues(%r{^\S+$})
-    defaultto 'false'
+    newvalues(/^\S+$/)
   end
 
   newparam(:auto_delete) do
     desc 'Exchange auto delete option to be set *on creation*'
-    newvalues(%r{^\S+$})
-    defaultto 'false'
+    newvalues(/^\S+$/)
   end
 
   newparam(:internal) do
     desc 'Exchange internal option to be set *on creation*'
-    newvalues(%r{^\S+$})
-    defaultto 'false'
+    newvalues(/^\S+$/)
   end
 
   newparam(:arguments) do
@@ -63,17 +44,17 @@ DESC
   newparam(:user) do
     desc 'The user to use to connect to rabbitmq'
     defaultto('guest')
-    newvalues(%r{^\S+$})
+    newvalues(/^\S+$/)
   end
 
   newparam(:password) do
     desc 'The password to use to connect to rabbitmq'
     defaultto('guest')
-    newvalues(%r{\S+})
+    newvalues(/\S+/)
   end
 
   validate do
-    if self[:ensure] == :present && self[:type].nil?
+    if self[:ensure] == :present and self[:type].nil?
       raise ArgumentError, "must set type when creating exchange for #{self[:name]} whose type is #{self[:type]}"
     end
   end
@@ -89,4 +70,5 @@ DESC
   autorequire(:rabbitmq_user_permissions) do
     ["#{self[:user]}@#{self[:name].split('@')[1]}"]
   end
+
 end