openstack/python-keystoneclient
Code Issues Proposed changes

Allow keystoneclient to work with older keystone installs

Browse Source 
Older keystone installs may return 501 for GET / instead of 300
like today. We should be able to assume that if 501 is returned the
server will support v2.0 only.

Fixes bug 1159911

Change-Id: If264840d8678a490264f1bdb62f1b51c362619e1
This commit is contained in:
Brian Lamar
2013-03-25 13:19:26 -04:00
parent 3a3e2540ff
commit 27b62a363e
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

@@ -410,7 +410,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')