diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-03-12 00:56:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-03-12 00:56:05 +0000 |
| commit | 92fce3613b78c9d3bc5d78a895425cdd86d4c208 (patch) | |
| tree | 5a28f7a376db2e5b0009de0299a73a25209445a8 /keystone/auth | |
| parent | 09e2fc7ec730ede3b8885638f90a3581a99bf538 (diff) | |
| parent | f423429fcf1dcbb09833df0ef21549d6d301a56f (diff) | |
| download | keystone-92fce3613b78c9d3bc5d78a895425cdd86d4c208.tar.gz keystone-92fce3613b78c9d3bc5d78a895425cdd86d4c208.tar.xz keystone-92fce3613b78c9d3bc5d78a895425cdd86d4c208.zip | |
Merge "cleanup trusts in controllers"
Diffstat (limited to 'keystone/auth')
| -rw-r--r-- | keystone/auth/controllers.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/keystone/auth/controllers.py b/keystone/auth/controllers.py index ec532b1b..517995dd 100644 --- a/keystone/auth/controllers.py +++ b/keystone/auth/controllers.py @@ -71,7 +71,7 @@ class AuthInfo(object): # self._scope_data is (domain_id, project_id, trust_ref) # project scope: (None, project_id, None) # domain scope: (domain_id, None, None) - # trust scope: (None, None, trust_id) + # trust scope: (None, None, trust_ref) # unscoped: (None, None, None) self._validate_and_normalize_auth_data() @@ -146,7 +146,7 @@ class AuthInfo(object): target='trust') trust = self.trust_api.get_trust(self.context, trust_id) if not trust: - raise exception.TrustNotFound(trust_id) + raise exception.TrustNotFound(trust_id=trust_id) return trust def lookup_user(self, user_info): |