Merge "Add rabbit_ha_queues option"

diff --cc manifests/init.pp
index 5f169f3dc05c1eb012731ae48eb070799a8e4e88,e5dca78c206c5fbb56a10d48ea1db865a035d6d7..7d7c29935bda09b36fb7b0a74cae6c4a14eb7236
--- 1/manifests/init.pp
--- 2/manifests/init.pp
+++ b/manifests/init.pp
@@@ -171,9 -171,9 +175,10 @@@ class ceilometer
    $rabbit_userid                      = 'guest',
    $rabbit_password                    = '',
    $rabbit_virtual_host                = '/',
+   $rabbit_ha_queues                   = undef,
    $rabbit_heartbeat_timeout_threshold = 0,
    $rabbit_heartbeat_rate              = 2,
 +  $amqp_durable_queues                = $::os_service_default,
    $rabbit_use_ssl                     = false,
    $kombu_ssl_ca_certs                 = undef,
    $kombu_ssl_certfile                 = undef,

diff --cc spec/classes/ceilometer_init_spec.rb
Simple merge