openstack/python-openstackclient
Code Issues Proposed changes

Merge "Fix catalog list when region name is absent"

Browse Source
This commit is contained in:
Jenkins 2015-03-08 17:59:16 +00:00 committed by Gerrit Code Review
commit 8f7e0ef35e
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openstackclient/identity/v2_0/catalog.py
View File

@ -28,7 +28,8 @@ def _format_endpoints(eps=None):
return "" return ""
ret = '' ret = ''
for index, ep in enumerate(eps): for index, ep in enumerate(eps):
ret += eps[index]['region'] + '\n' region = eps[index].get('region', '<none>')
ret += region + '\n'
for url in ['publicURL', 'internalURL', 'adminURL']: for url in ['publicURL', 'internalURL', 'adminURL']:
ret += " %s: %s\n" % (url, eps[index]['publicURL']) ret += " %s: %s\n" % (url, eps[index]['publicURL'])
return ret return ret