summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Brattain <ross.b.brattain@intel.com>2017-04-26 15:13:31 +0200
committerJing Lu <lvjing5@huawei.com>2017-05-04 07:41:55 +0000
commit4738c37f004d6a4e3c60cff5941b91ba162fbfde (patch)
treeb544be1ed4d7eb167b655faea53ff98d579c0e16
parent8362ebc1a0212f79bc9dedb4bf4d3865e811d440 (diff)
Bugfix: fix multi-region support
When running with multiple regions we need to specify the region when we select the endpoint. the region is specified in the OS_REGION_NAME env variable Change-Id: I37853dd42f6d9013d4475b5e3b2b9f97b6bdc8d0 Signed-off-by: Ross Brattain <ross.b.brattain@intel.com> (cherry picked from commit 90032ba61345752b014002dda629f84c42780e6c)
-rw-r--r--yardstick/common/openstack_utils.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/yardstick/common/openstack_utils.py b/yardstick/common/openstack_utils.py
index 2df8fa565..5cc056f84 100644
--- a/yardstick/common/openstack_utils.py
+++ b/yardstick/common/openstack_utils.py
@@ -84,9 +84,13 @@ def get_session():
def get_endpoint(service_type, endpoint_type='publicURL'):
auth = get_session_auth()
+ # for multi-region, we need to specify region
+ # when finding the endpoint
return get_session().get_endpoint(auth=auth,
service_type=service_type,
- endpoint_type=endpoint_type)
+ endpoint_type=endpoint_type,
+ region_name=os.environ.get(
+ "OS_REGION_NAME"))
# *********************************************