Merge pull request redhat-openstack#214 from puppetlabs/revert-171-mi…

…rrorqueue

Revert "Set appropriate policy for mirrored queues"

README.md

@@ -111,23 +111,6 @@ class { 'rabbitmq':
 }
 ```
 
-**NOTE:** If you are using a version of RabbitMQ less than 3.0,
-you still need to use `x-ha-policy: all` in your client
-applications for any particular queue to take advantage of H/A via
-mirrored queues.
-
-If you are using a version of RabbitMQ >= 3.0 You should set the
-'config_mirrored_queues' parameter if you plan
-on using RabbitMQ Mirrored Queues within your cluster:
-
-```puppet
-class { 'rabbitmq':
-  config_cluster         => true,
-  config_mirrored_queues => true,
-  cluster_nodes          => ['rabbit1', 'rabbit2'],
-}
-```
-
 ##Reference
 
 ##Classes

manifests/init.pp

@@ -6,7 +6,6 @@
   $cluster_nodes              = $rabbitmq::params::cluster_nodes,
   $config                     = $rabbitmq::params::config,
   $config_cluster             = $rabbitmq::params::config_cluster,
-  $config_mirrored_queues     = $rabbitmq::params::config_mirrored_queues,
   $config_path                = $rabbitmq::params::config_path,
   $config_stomp               = $rabbitmq::params::config_stomp,
   $default_user               = $rabbitmq::params::default_user,
@@ -70,7 +69,6 @@
   validate_string($config)
   validate_absolute_path($config_path)
   validate_bool($config_cluster)
-  validate_bool($config_mirrored_queues)
   validate_bool($config_stomp)
   validate_string($default_user)
   validate_string($default_pass)

manifests/management.pp

@@ -10,10 +10,4 @@
     }
   }
 
-  if $rabbitmq::config_mirrored_queues {
-    rabbitmq::policy { 'ha-all':
-      pattern  => '.*',
-      definition => '{"ha-mode":"all","ha-sync-mode":"automatic"}'
-    }
-  }
 }

manifests/params.pp

@@ -61,7 +61,6 @@
   $cluster_nodes              = []
   $config                     = 'rabbitmq/rabbitmq.config.erb'
   $config_cluster             = false
-  $config_mirrored_queues     = false
   $config_path                = '/etc/rabbitmq/rabbitmq.config'
   $config_stomp               = false
   $default_user               = 'guest'

manifests/server.pp

@@ -66,7 +66,7 @@
   }
 
   if $config_mirrored_queues != undef {
-    warning('The $config_mirrored_queues parameter is deprecated in this class, use the rabbitmq class')
+    warning('The $config_mirrored_queues parameter is deprecated; it does not affect anything')
   }
 
   anchor {'before::rabbimq::class':