openstack
/
magnum
Code Issues Proposed changes

Merge "Pass 'client', 'message' param to AuthorizationFailure Exception"

This commit is contained in:
Jenkins 2017-03-11 11:29:00 +00:00 committed by Gerrit Code Review
parent 329465da6b 44b83d3b14
commit dd2a8520cb
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
magnum/common/keystone.py
View File

@ -92,9 +92,11 @@ class KeystoneClientV3(object):
except ka_exception.MissingRequiredOptions:
auth = self._get_legacy_auth()
else:
LOG.error(_LE('Keystone API connection failed: no password, '
'trust_id or token found.'))
raise exception.AuthorizationFailure()
msg = _LE('Keystone API connection failed: no password, '
'trust_id or token found.')
LOG.error(msg)
raise exception.AuthorizationFailure(client='keystone',
message='reason %s' % msg)
return auth
@ -180,8 +182,11 @@ class KeystoneClientV3(object):
self.domain_admin_session
)
except kc_exception.Unauthorized:
LOG.error(_LE("Keystone client authentication failed"))
raise exception.AuthorizationFailure()
msg = _LE("Keystone client authentication failed")
LOG.error(msg)
raise exception.AuthorizationFailure(client='keystone',
message='reason: %s' %
msg)
self._trustee_domain_id = access.domain_id