From 19b3add649b44f0a41229ff422bf76e48b1775e4 Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien.macchi@enovance.com>
Date: Tue, 3 Dec 2013 16:15:30 +0100
Subject: [PATCH] RabbitMQ support

Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
---
 roles/messaging/rabbitmq.pp | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/roles/messaging/rabbitmq.pp b/roles/messaging/rabbitmq.pp
index cb0fd7b5..3ceffb4f 100644
--- a/roles/messaging/rabbitmq.pp
+++ b/roles/messaging/rabbitmq.pp
@@ -16,14 +16,18 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations
 # under the License.
-
+#
 # RabbitMQ node
+#
 
-class os_rabbitmq{
+class os_rabbitmq(
+  $rabbit_names    = $os_params::rabbit_names,
+  $rabbit_password = $os_params::rabbit_password
+){
   class { 'rabbitmq::server':
     delete_guest_user        => true,
     config_cluster           => true,
-    cluster_disk_nodes       => $os_params::rabbit_names,
+    cluster_disk_nodes       => $rabbit_names,
     wipe_db_on_cookie_change => true,
   }
 
@@ -31,20 +35,19 @@ class os_rabbitmq{
     provider => 'rabbitmqctl',
     require  => Class['rabbitmq::server'],
   }
-  rabbitmq_user { ['nova','glance', 'quantum', 'cinder', 'ceilometer', 'heat', 'sensu']:
+  rabbitmq_user { ['nova', 'glance', 'neutron', 'cinder', 'ceilometer', 'heat']:
     admin    => true,
-    password => $os_params::rabbit_password,
+    password => $rabbit_password,
     provider => 'rabbitmqctl',
     require  => Class['rabbitmq::server']
   }
   rabbitmq_user_permissions {[
     'nova@/',
     'glance@/',
-    'quantum@/',
+    'neutron@/',
     'cinder@/',
     'ceilometer@/',
     'heat@/',
-    'sensu@/',
   ]:
     configure_permission => '.*',
     write_permission     => '.*',