git://git.onelab.eu
/
plstackapi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
85d1883
)
alway give user 'user' role at their home site
author
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Thu, 9 May 2013 21:22:31 +0000
(17:22 -0400)
committer
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Thu, 9 May 2013 21:22:31 +0000
(17:22 -0400)
plstackapi/openstack/manager.py
patch
|
blob
|
history
diff --git
a/plstackapi/openstack/manager.py
b/plstackapi/openstack/manager.py
index
86ad014
..
b912934
100644
(file)
--- a/
plstackapi/openstack/manager.py
+++ b/
plstackapi/openstack/manager.py
@@
-79,12
+79,12
@@
class OpenStackManager:
keystone_user = self.driver.create_user(**user_fields)
user.user_id = keystone_user.id
if user.site:
keystone_user = self.driver.create_user(**user_fields)
user.user_id = keystone_user.id
if user.site:
+ self.driver.add_user_role(user.user_id, user.site.tenant_id, 'user')
if user.is_admin:
self.driver.add_user_role(user.user_id, user.site.tenant_id, 'admin')
else:
# may have admin role so attempt to remove it
if user.is_admin:
self.driver.add_user_role(user.user_id, user.site.tenant_id, 'admin')
else:
# may have admin role so attempt to remove it
- self.driver.remove_user_role(user.user_id, user.site.tenant_id, 'admin')
- self.driver.add_user_role(user.user_id, user.site.tenant_id, 'user')
+ self.driver.delete_user_role(user.user_id, user.site.tenant_id, 'admin')
@require_enabled
def delete_user(self, user):
@require_enabled
def delete_user(self, user):