summaryrefslogtreecommitdiffstats
path: root/nova/auth
diff options
context:
space:
mode:
authorVishvananda Ishaya <vishvananda@gmail.com>2011-07-22 21:36:41 +0000
committerVishvananda Ishaya <vishvananda@gmail.com>2011-07-22 21:36:41 +0000
commitccb5119280d341a2ea1b3e8352acbf32b7f243af (patch)
tree84210ae1e9325ed810e732a95753aedd262eed94 /nova/auth
parente8defa6bdd5af85486d0d3acce8956670ca16882 (diff)
clean up fake auth manager in other places
Diffstat (limited to 'nova/auth')
-rw-r--r--nova/auth/manager.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/nova/auth/manager.py b/nova/auth/manager.py
index 7f99d9016..5118abba2 100644
--- a/nova/auth/manager.py
+++ b/nova/auth/manager.py
@@ -521,8 +521,7 @@ class AuthManager(object):
def get_active_roles(self, user, project=None):
"""Get all active roles for context"""
if project:
- roles = FLAGS.allowed_roles
- roles.append('projectmanager')
+ roles = FLAGS.allowed_roles + ['projectmanager']
else:
roles = FLAGS.global_roles
return [role for role in roles if self.has_role(user, role, project)]