From a4bc59a80306e582f571dc84e51b71f5342bc627 Mon Sep 17 00:00:00 2001
From: Adam Gandelman <adamg@canonical.com>
Date: Mon, 5 Dec 2011 11:55:29 -0800
Subject: [PATCH] Update rabbitmctl usage to rabbitmq 2.6 (precise) (LP:
 #900440)

---
 hooks/rabbitmq-common | 6 +++---
 revision              | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/hooks/rabbitmq-common b/hooks/rabbitmq-common
index 1204125d..2cfcdbc4 100755
--- a/hooks/rabbitmq-common
+++ b/hooks/rabbitmq-common
@@ -23,11 +23,11 @@ HOSTNAME=`hostname -f`
 ERLANG_COOKIE="/var/lib/rabbitmq/.erlang.cookie"
 
 function user_exists {
-  $RABBIT_CTL list_users | grep $1 >/dev/null
+  $RABBIT_CTL list_users | grep -wq "^$1"
 }
 
 function user_is_admin {
-  $RABBIT_CTL list_users | grep $1 | grep true >/dev/null
+  $RABBIT_CTL list_users | grep -w "^$1" | grep -q "administrator"
 }
 
 function vhost_exists {
@@ -51,6 +51,6 @@ function user_create {
   if [[ $2 == 'admin' ]]  ; then
     user_is_admin $1 && return 0
     juju-log "rabbitmq: Granting user $1 admin access"
-    $RABBIT_CTL set_admin $1 || return 1
+    $RABBIT_CTL set_user_tags "$1" administrator || return 1
   fi
 }
diff --git a/revision b/revision
index 9e5feb52..abac1ea7 100644
--- a/revision
+++ b/revision
@@ -1 +1 @@
-46
+47