commit 9033d87b3f2b8e6836101b77d8ae9f6c5d41b9d1
Author: Andy McCrae <andy.mccrae@gmail.com>
Date:   Fri Jul 3 17:44:28 2015 +0100

    Add MaaS specific rabbitmq user
    
    Since we are removing the guest/guest user from rabbitmq as part of
    os-ad we need to create a maas specific user that has "administrator"
    privileges, otherwise the monitors don't work.
    
    This patch adds a maas_user to rabbit, with a password specified in
    user_extras_secrets. This is then passed to the monitors for rabbit as
    they are created.

diff --git a/etc/rpc_deploy/user_variables.yml b/etc/rpc_deploy/user_variables.yml
index 40977e9..c22d5eb 100644
--- a/etc/rpc_deploy/user_variables.yml
+++ b/etc/rpc_deploy/user_variables.yml
@@ -117,6 +117,8 @@ maas_scheme: https
 # maas_nova_scheme: http
 maas_keystone_user: maas
 maas_keystone_password:
+maas_rabbitmq_user: maas_user
+maas_rabbitmq_password:
 # Check this number of times before registering state change
 maas_alarm_local_consecutive_count: 3
 maas_alarm_remote_consecutive_count: 1
diff --git a/rpc_deployment/playbooks/monitoring/maas_local.yml b/rpc_deployment/playbooks/monitoring/maas_local.yml
index 15e4656..d15593d 100644
--- a/rpc_deployment/playbooks/monitoring/maas_local.yml
+++ b/rpc_deployment/playbooks/monitoring/maas_local.yml
@@ -304,7 +304,7 @@
 - hosts: rabbit
   vars:
     check_name: rabbitmq_status
-    check_details: file={{ check_name }}.py,args=-H,args={{ ansible_ssh_host }},args=-n,args={{ inventory_hostname.split('.')[0] }}
+    check_details: file={{ check_name }}.py,args=-H,args={{ ansible_ssh_host }},args=-n,args={{ inventory_hostname.split('.')[0] }},args=-U,args={{ maas_rabbitmq_user }},args=-p,args={{ maas_rabbitmq_password }}
     check_period: "{{ maas_check_period }}"
     check_timeout: "{{ maas_check_timeout }}"
     alarms:
diff --git a/rpc_deployment/playbooks/monitoring/raxmon_agent.yml b/rpc_deployment/playbooks/monitoring/raxmon_agent.yml
index 11ac13d..43e0e3b 100644
--- a/rpc_deployment/playbooks/monitoring/raxmon_agent.yml
+++ b/rpc_deployment/playbooks/monitoring/raxmon_agent.yml
@@ -46,4 +46,20 @@
       endpoint="{{ auth_admin_uri }}"
       user_name="{{ maas_keystone_user }}"
       tenant_name=admin
-      role_name=admin
+
+- hosts: rabbit[0]
+  user: root
+  tasks:
+  - name: Ensure MaaS rabbitmq user as administrator
+    rabbitmq_user:
+      user: "{{ maas_rabbitmq_user }}"
+      password: "{{ maas_rabbitmq_password }}"
+      vhost: "/"
+      configure_priv: ".*"
+      read_priv: ".*"
+      write_priv: ".*"
+      tags: "administrator"
+      state: "present"
+    tags:
+      - rabbitmq-userle_name=admin
+