diff options
| author | Russell Bryant <rbryant@redhat.com> | 2013-03-22 12:47:27 -0400 |
|---|---|---|
| committer | Russell Bryant <rbryant@redhat.com> | 2013-03-22 12:56:42 -0400 |
| commit | bceee56097ec705298caac0fa8651c3c0b79d972 (patch) | |
| tree | 0e6915f02e6d0e7df1448138a375c21ab4d2ebee /keystone/auth | |
| parent | 09811ecce51a602ee92422b7ea69b93f15796523 (diff) | |
| download | keystone-bceee56097ec705298caac0fa8651c3c0b79d972.tar.gz keystone-bceee56097ec705298caac0fa8651c3c0b79d972.tar.xz keystone-bceee56097ec705298caac0fa8651c3c0b79d972.zip | |
Rename trust extension.
Change trust extension from RH-TRUST to OS-TRUST so that the namespace
being used is for OpenStack, as opposed to a contributing company. This
is also more consistent with namespacing used in other OpenStack APIs.
Some additional discussion about this is in this thread:
http://lists.openstack.org/pipermail/openstack-dev/2013-March/006876.html
Change-Id: I0fd869abe0f527c899808a4dde19dbd1fb6f32cd
Diffstat (limited to 'keystone/auth')
| -rw-r--r-- | keystone/auth/controllers.py | 8 | ||||
| -rw-r--r-- | keystone/auth/token_factory.py | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/keystone/auth/controllers.py b/keystone/auth/controllers.py index 1ab9de03..113655db 100644 --- a/keystone/auth/controllers.py +++ b/keystone/auth/controllers.py @@ -171,9 +171,9 @@ class AuthInfo(object): return if sum(['project' in self.auth['scope'], 'domain' in self.auth['scope'], - 'RH-TRUST:trust' in self.auth['scope']]) != 1: + 'OS-TRUST:trust' in self.auth['scope']]) != 1: raise exception.ValidationError( - attribute='project, domain, or RH-TRUST:trust', + attribute='project, domain, or OS-TRUST:trust', target='scope') if 'project' in self.auth['scope']: @@ -182,11 +182,11 @@ class AuthInfo(object): elif 'domain' in self.auth['scope']: domain_ref = self._lookup_domain(self.auth['scope']['domain']) self._scope_data = (domain_ref['id'], None, None) - elif 'RH-TRUST:trust' in self.auth['scope']: + elif 'OS-TRUST:trust' in self.auth['scope']: if not CONF.trust.enabled: raise exception.Forbidden('Trusts are disabled.') trust_ref = self._lookup_trust( - self.auth['scope']['RH-TRUST:trust']) + self.auth['scope']['OS-TRUST:trust']) #TODO ayoung when trusts support domain, Fill in domain data here if 'project_id' in trust_ref: project_ref = self._lookup_project( diff --git a/keystone/auth/token_factory.py b/keystone/auth/token_factory.py index 430c442a..909aa48a 100644 --- a/keystone/auth/token_factory.py +++ b/keystone/auth/token_factory.py @@ -114,7 +114,7 @@ class TokenDataHelper(object): raise exception.Forbidden() if trust['impersonation']: user_ref = trustor_user_ref - token_data['RH-TRUST:trust'] = ( + token_data['OS-TRUST:trust'] = ( { 'id': trust['id'], 'trustor_user': {'id': trust['trustor_user_id']}, |