diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-03-26 00:32:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-03-26 00:32:20 +0000 |
| commit | 16ca30673773ff4e30c4165e7b355cedc65c789b (patch) | |
| tree | 2c435712a42b7f590f4d52111a7ea3c47242e65f /keystoneclient/discover.py | |
| parent | 028bdb851967698b1239f33ab3c4296ee8d25553 (diff) | |
| parent | ba530a44fbb6c591647a98405b27a64809f8b3c4 (diff) | |
| download | python-keystoneclient-0.7.0.tar.gz | |
Merge "Discover should support other services"0.7.0
Diffstat (limited to 'keystoneclient/discover.py')
| -rw-r--r-- | keystoneclient/discover.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/keystoneclient/discover.py b/keystoneclient/discover.py index 9c6313f..77cc00e 100644 --- a/keystoneclient/discover.py +++ b/keystoneclient/discover.py @@ -153,6 +153,13 @@ def available_versions(url, session=None, **kwargs): except (KeyError, TypeError): pass + # Most servers don't have a 'values' element so accept a simple + # versions dict if available. + try: + return body_resp['versions'] + except KeyError: + pass + # Otherwise if we query an endpoint like /v2.0 then we will get back # just the one available version. try: |