diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-05-25 18:56:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-05-25 18:56:14 +0000 |
| commit | 0d8dab6288a81b7606c518eac3e0ea21f6d8dac3 (patch) | |
| tree | c57689b05809a18b767ab7f5968ce4dbc0afba1b /openstackclient/identity | |
| parent | 646f702958b0a1b4a5e77305febe54119c1a3b5d (diff) | |
| parent | e44bb009d36bddc0fdfb6e949ddc293de291dcca (diff) | |
| download | python-openstackclient-0d8dab6288a81b7606c518eac3e0ea21f6d8dac3.tar.gz | |
Merge "keystone: fix catalog output when region is unset"
Diffstat (limited to 'openstackclient/identity')
| -rw-r--r-- | openstackclient/identity/v2_0/catalog.py | 4 | ||||
| -rw-r--r-- | openstackclient/identity/v3/catalog.py | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/openstackclient/identity/v2_0/catalog.py b/openstackclient/identity/v2_0/catalog.py index 669b04f3..53a6fe34 100644 --- a/openstackclient/identity/v2_0/catalog.py +++ b/openstackclient/identity/v2_0/catalog.py @@ -25,7 +25,9 @@ def _format_endpoints(eps=None): return "" ret = '' for index, ep in enumerate(eps): - region = eps[index].get('region', '<none>') + region = eps[index].get('region') + if region is None: + region = '<none>' ret += region + '\n' for endpoint_type in ['publicURL', 'internalURL', 'adminURL']: url = eps[index].get(endpoint_type) diff --git a/openstackclient/identity/v3/catalog.py b/openstackclient/identity/v3/catalog.py index 38a57d90..78d71f59 100644 --- a/openstackclient/identity/v3/catalog.py +++ b/openstackclient/identity/v3/catalog.py @@ -25,7 +25,7 @@ def _format_endpoints(eps=None): return "" ret = '' for ep in eps: - region = ep.get('region_id') or ep.get('region', '<none>') + region = ep.get('region_id') or ep.get('region') or '<none>' ret += region + '\n' ret += " %s: %s\n" % (ep['interface'], ep['url']) return ret |