summaryrefslogtreecommitdiff
path: root/openstackclient/identity/v2_0
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-07-09 15:58:34 +0000
committerGerrit Code Review <review@openstack.org>2015-07-09 15:58:34 +0000
commit35dc2bed9ea802f577fd1ce7b3eadd1e18f5772a (patch)
treeef1e5f260857041ba38b516824a0962bc9b5c91c /openstackclient/identity/v2_0
parenta3f50eafa58b27c576b398ebcbb1bebddf1d56c9 (diff)
parent7af00f833f83bf375a4270bff609f62902a6c887 (diff)
downloadpython-openstackclient-35dc2bed9ea802f577fd1ce7b3eadd1e18f5772a.tar.gz
Merge "openstack catalog list always returns publicURL for internalURL and adminURL"
Diffstat (limited to 'openstackclient/identity/v2_0')
-rw-r--r--openstackclient/identity/v2_0/catalog.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/openstackclient/identity/v2_0/catalog.py b/openstackclient/identity/v2_0/catalog.py
index 7d17fbf5..c10001d0 100644
--- a/openstackclient/identity/v2_0/catalog.py
+++ b/openstackclient/identity/v2_0/catalog.py
@@ -31,7 +31,7 @@ def _format_endpoints(eps=None):
region = eps[index].get('region', '<none>')
ret += region + '\n'
for url in ['publicURL', 'internalURL', 'adminURL']:
- ret += " %s: %s\n" % (url, eps[index]['publicURL'])
+ ret += " %s: %s\n" % (url, eps[index][url])
return ret