diff options
| author | Soren Hansen <soren.hansen@rackspace.com> | 2010-09-24 10:25:29 +0200 |
|---|---|---|
| committer | Soren Hansen <soren.hansen@rackspace.com> | 2010-09-24 10:25:29 +0200 |
| commit | 3e8c19c42bd56dfc1cb428f3a39d0f102c65a4ac (patch) | |
| tree | 142d3d6cad7d1156db67c8ef3eed8e6a502417c0 /nova/auth | |
| parent | fed57c47da49a0457fce8fec3b59c9142e62785e (diff) | |
| parent | cb311a3deb42094261b91467b7717f4eb3e9eaba (diff) | |
| download | nova-3e8c19c42bd56dfc1cb428f3a39d0f102c65a4ac.tar.gz nova-3e8c19c42bd56dfc1cb428f3a39d0f102c65a4ac.tar.xz nova-3e8c19c42bd56dfc1cb428f3a39d0f102c65a4ac.zip | |
Merge trunk
Diffstat (limited to 'nova/auth')
| -rw-r--r-- | nova/auth/manager.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nova/auth/manager.py b/nova/auth/manager.py index c6f366087..7075070cf 100644 --- a/nova/auth/manager.py +++ b/nova/auth/manager.py @@ -44,7 +44,7 @@ flags.DEFINE_list('allowed_roles', # NOTE(vish): a user with one of these roles will be a superuser and # have access to all api commands flags.DEFINE_list('superuser_roles', ['cloudadmin'], - 'Roles that ignore rbac checking completely') + 'Roles that ignore authorization checking completely') # NOTE(vish): a user with one of these roles will have it for every # project, even if he or she is not a member of the project @@ -266,7 +266,7 @@ class AuthManager(object): # NOTE(vish): if we stop using project name as id we need better # logic to find a default project for user - if project_id is '': + if project_id == '': project_id = user.name project = self.get_project(project_id) @@ -304,7 +304,7 @@ class AuthManager(object): return "%s:%s" % (user.access, Project.safe_id(project)) def is_superuser(self, user): - """Checks for superuser status, allowing user to bypass rbac + """Checks for superuser status, allowing user to bypass authorization @type user: User or uid @param user: User to check. |