openstack/swift
Code Issues Proposed changes

Merge "Bug #904830: use type==object-store instead of name==swift from service catalog"

Browse Source
This commit is contained in:
Jenkins 2012-01-12 15:37:24 +00:00 committed by Gerrit Code Review
commit 05ae8686b9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bin/swift
View File

@ -248,11 +248,11 @@ def _get_auth_v2_0(url, user, key, snet):
url = None
catalogs = body['access']['serviceCatalog']
for service in catalogs:
if service['name'] == 'swift':
if service['type'] == 'object-store':
url = service['endpoints'][0]['publicURL']
token_id = body['access']['token']['id']
if not url:
raise ClientException("There is no swift endpoint " \
raise ClientException("There is no object-store endpoint " \
"on this auth server.")
except(KeyError, IndexError):
raise ClientException("Error while getting answers from auth server")