Bugfix: fix multi-region support 11/34211/1
authorRoss Brattain <ross.b.brattain@intel.com>
Wed, 26 Apr 2017 13:13:31 +0000 (15:13 +0200)
committerJing Lu <lvjing5@huawei.com>
Thu, 4 May 2017 07:41:55 +0000 (07:41 +0000)
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)

yardstick/common/openstack_utils.py

index 2df8fa5..5cc056f 100644 (file)
@@ -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"))
 
 
 # *********************************************