Merge lp:~yolanda.robla/charms/precise/keystone/ha-support into lp:~openstack-charmers/charms/precise/keystone/ha-support

[Yolanda Robla]

Associating user with role, when requested_roles setting is specified

=== modified file 'hooks/keystone_hooks.py'
--- hooks/keystone_hooks.py	2013-04-04 23:39:30 +0000
+++ hooks/keystone_hooks.py	2013-04-09 10:00:33 +0000
@@ -211,15 +211,6 @@
     settings = utils.relation_get_dict(relation_id=relation_id,
                                        remote_unit=remote_unit)
 
-    # Allow the remote service to request creation of any additional roles.
-    # Currently used by Swift.
-    if 'requested_roles' in settings and settings['requested_roles'] != 'None':
-        roles = settings['requested_roles'].split(',')
-        utils.juju_log('INFO',
-                       "Creating requested roles: %s" % roles)
-        for role in roles:
-            create_role(role, user=config['admin-user'], tenant='admin')
-
     # the minimum settings needed per endpoint
     single = set(['service', 'region', 'public_url', 'admin_url',
                   'internal_url'])
@@ -315,6 +306,16 @@
     grant_role(service_username, config['admin-role'],
                config['service-tenant'])
 
+    # Allow the remote service to request creation of any additional roles.
+    # Currently used by Swift and Ceilometer.
+    if 'requested_roles' in settings and settings['requested_roles'] != 'None':
+        roles = settings['requested_roles'].split(',')
+        utils.juju_log('INFO',
+                       "Creating requested roles: %s" % roles)
+        for role in roles:
+            create_role(role, service_username, config['service-tenant'])
+            grant_role(service_username, role, config['service-tenant'])
+
     # As of https://review.openstack.org/#change,4675, all nodes hosting
     # an endpoint(s) needs a service username and password assigned to
     # the service tenant and granted admin role.

=== modified file 'revision'
--- revision	2013-04-04 23:39:30 +0000
+++ revision	2013-04-09 10:00:33 +0000
@@ -1,1 +1,1 @@
-213
+217