diff options
| author | Todd Willey <todd@ansolabs.com> | 2011-01-13 18:23:18 -0500 |
|---|---|---|
| committer | Todd Willey <todd@ansolabs.com> | 2011-01-13 18:23:18 -0500 |
| commit | 16a8f4a98973ae5e5541f2b43db4dc36eaed2647 (patch) | |
| tree | b7a3226c73d4b2bc4ab9473688138aa2e2cbdd7f /nova/auth | |
| parent | 73e49ac35cc8b0a97dd7cd9b39cf00cd15b1d9dd (diff) | |
| parent | 24e6372891be1b6dd81de0af89ece88f256a32e9 (diff) | |
Merge trunk and fix how nova-combined works with paste.deploy.
Refactor some of the bits of nova-api into nova/wsgi for working with paste,
for a little bit of de-duplication between nova-api and nova-combined.
Makes a cleaner interface for how paste configs can set flags.
Diffstat (limited to 'nova/auth')
| -rw-r--r-- | nova/auth/manager.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/auth/manager.py b/nova/auth/manager.py index ea7d07b1e..1652e24e1 100644 --- a/nova/auth/manager.py +++ b/nova/auth/manager.py @@ -721,7 +721,7 @@ class AuthManager(object): if project is None: project = user.id pid = Project.safe_id(project) - return self.__generate_rc(user.access, user.secret, pid, use_dmz) + return self.__generate_rc(user, pid, use_dmz) @staticmethod def __generate_rc(user, pid, use_dmz=True, host=None): |