Merge lp:~gandelman-a/charms/precise/keystone/fix-grant-role into lp:~charmers/charms/precise/keystone/trunk

[Adam Gandelman]

Avoids an exception that is raised when attempting to redefine an already existing association between a role and user+tenant. This makes utils.grant_role() check for the association before adding it.

This only triggers when using this charm to deploy Folsom, the exception is not raised in Essex. However, I'd prefer to fix in the Precise branch since:

- the functionality is there.
- its best practice.
- minimize the delta between the precise/keystone and quantal/keystone (when it opens)

[Mark Mims (mark-mims)]

lgtm

review: Approve

=== modified file 'hooks/utils.py'
--- hooks/utils.py	2012-03-02 20:46:20 +0000
+++ hooks/utils.py	2012-08-08 21:46:19 +0000
@@ -337,14 +337,22 @@
     import manager
     manager = manager.KeystoneManager(endpoint='http://localhost:35357/v2.0/',
                                       token=get_admin_token())
-    juju_log("Granting user '%s' role '%s' on tenant ' %s'" %\
+    juju_log("Granting user '%s' role '%s' on tenant '%s'" %\
                 (user, role, tenant))
     user_id = manager.resolve_user_id(user)
     role_id = manager.resolve_role_id(role)
     tenant_id = manager.resolve_tenant_id(tenant)
-    manager.api.roles.add_user_role(user=user_id,
-                                    role=role_id,
-                                    tenant=tenant_id)
+
+    cur_roles =  manager.api.roles.roles_for_user(user_id, tenant_id)
+    if not cur_roles or role_id not in [r.id for r in cur_roles]:
+        manager.api.roles.add_user_role(user=user_id,
+                                        role=role_id,
+                                        tenant=tenant_id)
+        juju_log("Granted user '%s' role '%s' on tenant '%s'" %\
+                    (user, role, tenant))
+    else:
+        juju_log("User '%s' already has role '%s' on tenant '%s'" %\
+                    (user, role, tenant))
 
 def generate_admin_token(config):
     """ generate and add an admin token """

=== modified file 'revision'
--- revision	2012-03-08 22:38:36 +0000
+++ revision	2012-08-08 21:46:19 +0000
@@ -1,1 +1,1 @@
-138
+139