Merge lp:~negronjl/charms/precise/rabbitmq-server/lp1312291 into lp:charms/rabbitmq-server

[Juan L. Negron]

Fix for lp:1312291

[Marco Ceppi (marcoceppi)]

LGTM, +1

review: Approve

=== modified file 'hooks/rabbitmq_server_relations.py'
--- hooks/rabbitmq_server_relations.py	2014-03-28 11:32:22 +0000
+++ hooks/rabbitmq_server_relations.py	2014-04-24 16:33:37 +0000
@@ -56,6 +56,8 @@
 SERVICE_NAME = os.getenv('JUJU_UNIT_NAME').split('/')[0]
 POOL_NAME = SERVICE_NAME
 RABBIT_DIR = '/var/lib/rabbitmq'
+RABBIT_USER = 'rabbitmq'
+RABBIT_GROUP = 'rabbitmq'
 NAGIOS_PLUGINS = '/usr/local/lib/nagios/plugins'
 
 
@@ -331,8 +333,10 @@
                                  rbd_img=rbd_img, sizemb=sizemb,
                                  fstype='ext4', mount_point=RABBIT_DIR,
                                  blk_device=blk_device,
-                                 system_services=['rabbitmq-server'],
-                                 rbd_pool_replicas=rbd_pool_rep_count)
+                                 system_services=['rabbitmq-server'])#,
+                                 #rbd_pool_replicas=rbd_pool_rep_count)
+        subprocess.check_call(['chown', '-R', '%s:%s' %
+            (RABBIT_USER,RABBIT_GROUP), RABBIT_DIR])
     else:
         log('This is not the peer leader. Not configuring RBD.')
         log('Stopping rabbitmq-server.')