Merge lp:~cprov/charms/precise/rabbitmq-server/rabbit-admin into lp:charms/rabbitmq-server

[Celso Providelo]

This branch extends the amqp relationship to support an optional parameter 'admin'. If it's present and non-empty the context user will be created/update with admin rights.

The motivation for this branch is to allow joined instances to access the management-plugin API (e.g. http://<rabbit>:55672/api/[queues,...]).

It's unfortunate, to say the least, that we have to grant unrestricted admin rights for performing read-only diagnose/monitoring requests, but the management-plugin does not seem to offer any other alternative.

[Celso Providelo (cprov)]

Callsite example available in https://code.launchpad.net/~cprov/uci-engine/webui-rabbit-credentials/+merge/233037

[Tom Haddon (mthaddon)]

I think this looks okay, but I'd like to confirm how https://launchpad.net/~openstack-charmers feel about it, given rabbitmq is a core piece of openstack infrastructure.

[James Page (james-page)]

review: Approve

[Charles Butler (lazypower)]

Thanks for the contribution Celso!

I've validated and merged. if this needs to be promoted against the trusty version of the charm please open another MP targeted at trusty, as this was only targeted against precise I did not promote to series: trusty.

Thanks again!

review: Approve

=== modified file 'hooks/rabbitmq_server_relations.py'
--- hooks/rabbitmq_server_relations.py	2014-06-30 10:26:02 +0000
+++ hooks/rabbitmq_server_relations.py	2014-09-03 12:53:06 +0000
@@ -68,13 +68,13 @@
     # NOTE(jamespage) install actually happens in config_changed hook
 
 
-def configure_amqp(username, vhost):
+def configure_amqp(username, vhost, admin=False):
     # get and update service password
     password = rabbit.get_rabbit_password(username)
 
     # update vhost
     rabbit.create_vhost(vhost)
-    rabbit.create_user(username, password)
+    rabbit.create_user(username, password, admin)
     rabbit.grant_permissions(username, vhost)
 
     return password
@@ -99,7 +99,8 @@
 
         relation_settings['password'] = configure_amqp(
             username=settings['username'],
-            vhost=settings['vhost'])
+            vhost=settings['vhost'],
+            admin=settings.get('admin', False))
     else:
         queues = {}
         for k, v in settings.iteritems():