From 4738c37f004d6a4e3c60cff5941b91ba162fbfde Mon Sep 17 00:00:00 2001 From: Ross Brattain Date: Wed, 26 Apr 2017 15:13:31 +0200 Subject: 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 (cherry picked from commit 90032ba61345752b014002dda629f84c42780e6c) --- yardstick/common/openstack_utils.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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")) # ********************************************* -- cgit 1.2.3-korg