openstack/swift
Code Issues Proposed changes

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

Browse Source 
The name field in the service catalog is an operator-specified, marketing name.
The type field contains the canonical name for the service (i.e., swift is
object-store).

Change-Id: I8556b3e6fddd8784f259170195352478d9c6ae32
This commit is contained in:
Donagh McCabe
2012-01-05 11:07:23 +00:00
parent 0a7f8ca7b1
commit 6fe46ad056
1 changed files with 2 additions and 2 deletions
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 url = None
catalogs = body['access']['serviceCatalog'] catalogs = body['access']['serviceCatalog']
for service in catalogs: for service in catalogs:
if service['name'] == 'swift': if service['type'] == 'object-store':
url = service['endpoints'][0]['publicURL'] url = service['endpoints'][0]['publicURL']
token_id = body['access']['token']['id'] token_id = body['access']['token']['id']
if not url: if not url:
raise ClientException("There is no swift endpoint " \ raise ClientException("There is no object-store endpoint " \
"on this auth server.") "on this auth server.")
except(KeyError, IndexError): except(KeyError, IndexError):
raise ClientException("Error while getting answers from auth server") raise ClientException("Error while getting answers from auth server")