Merge "Fix catalog list when region name is absent"

Jenkins · openstack-gerrit · commit 8f7e0ef35e49 · 2015-03-08T17:59:16.000Z
diff --git 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
