diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-03-08 17:59:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-03-08 17:59:16 +0000 |
| commit | 8f7e0ef35e49ba320ac0bf7e2cc650f316a170bf (patch) | |
| tree | a39e739259a7e6a81bfbb56662b54a5d392a0fe2 /openstackclient/identity | |
| parent | 0efc8668bf85baccb9126942388680ff60d52b6a (diff) | |
| parent | ee2ba48aa4d32e12a18e2722492e99fca5dd03e5 (diff) | |
| download | python-openstackclient-8f7e0ef35e49ba320ac0bf7e2cc650f316a170bf.tar.gz | |
Merge "Fix catalog list when region name is absent"
Diffstat (limited to 'openstackclient/identity')
| -rw-r--r-- | openstackclient/identity/v2_0/catalog.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/openstackclient/identity/v2_0/catalog.py b/openstackclient/identity/v2_0/catalog.py index 363d5ab2..7d17fbf5 100644 --- a/openstackclient/identity/v2_0/catalog.py +++ b/openstackclient/identity/v2_0/catalog.py @@ -28,7 +28,8 @@ def _format_endpoints(eps=None): return "" ret = '' 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']: ret += " %s: %s\n" % (url, eps[index]['publicURL']) return ret |