summaryrefslogtreecommitdiff
path: root/openstackclient/common
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-10-14 04:11:24 +0000
committerGerrit Code Review <review@openstack.org>2014-10-14 04:11:24 +0000
commit87f5da02c3c0db6807aaa829ada711b3e7a27ce6 (patch)
tree53784495734c8b50ca6868e80f7dfe17250af2ba /openstackclient/common
parent79a9331f95979c4ca3c2b8f8bcda7b5d6ef0ddd9 (diff)
parent3af547a1a6e597ea1b38fb273195ac1ef00d29dd (diff)
downloadpython-openstackclient-87f5da02c3c0db6807aaa829ada711b3e7a27ce6.tar.gz
Merge "Fix operation on clouds with availability-zones"
Diffstat (limited to 'openstackclient/common')
-rw-r--r--openstackclient/common/clientmanager.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/openstackclient/common/clientmanager.py b/openstackclient/common/clientmanager.py
index 0542b473..387721a4 100644
--- a/openstackclient/common/clientmanager.py
+++ b/openstackclient/common/clientmanager.py
@@ -110,13 +110,13 @@ class ClientManager(object):
return
- def get_endpoint_for_service_type(self, service_type):
+ def get_endpoint_for_service_type(self, service_type, region_name=None):
"""Return the endpoint URL for the service type."""
# See if we are using password flow auth, i.e. we have a
# service catalog to select endpoints from
if self._service_catalog:
endpoint = self._service_catalog.url_for(
- service_type=service_type)
+ service_type=service_type, region_name=region_name)
else:
# Hope we were given the correct URL.
endpoint = self._auth_url or self._url