openstack/python-keystoneclient
Code Issues Proposed changes

Merge "Allow keystoneclient to work with older keystone installs"

Browse Source
This commit is contained in:
Jenkins
2013-06-11 16:19:54 +00:00
committed by Gerrit Code Review
parent 2ec2e7ee31 27b62a363e
commit 76daaffd87
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
keystoneclient/middleware/auth_token.py
View File

@@ -417,7 +417,10 @@ class AuthProtocol(object):
def _get_supported_versions(self): def _get_supported_versions(self):
versions = [] versions = []
response, data = self._json_request('GET', '/') response, data = self._json_request('GET', '/')
if response.status != 300: if response.status == 501:
self.LOG.warning("Old keystone installation found...assuming v2.0")
versions.append("v2.0")
elif response.status != 300:
self.LOG.error('Unable to get version info from keystone: %s' % self.LOG.error('Unable to get version info from keystone: %s' %
response.status) response.status)
raise ServiceError('Unable to get version info from keystone') raise ServiceError('Unable to get version info from keystone')