commit 393d3c114a6ca4935a4d0e0bcf3e242e5cfcbf65
author Zuul <zuul@review.opendev.org> Fri Sep 20 23:20:11 2019 +0000
committer Gerrit Code Review <review@openstack.org> Fri Sep 20 23:20:11 2019 +0000
tree 7a8b6c5f1948cdfeda9ae8af5a95c9d0a5acf5fe
parent 01f46329170e983a72dee073ca771fc25bc7ef2a
parent 52b5843e8c48d3f05d1b3bf98389607aa0a771d0

Merge "Fix OpenStack clients region parameter"

octavia_tempest_plugin/clients.py

diff --git a/octavia_tempest_plugin/clients.py b/octavia_tempest_plugin/clients.py
index f85404c..f2a7767 100644
--- a/octavia_tempest_plugin/clients.py
+++ b/octavia_tempest_plugin/clients.py
@@ -52,7 +52,7 @@
         params.update({
             'auth_provider': self.auth_provider,
             'service': CONF.load_balancer.catalog_type,
-            'region': CONF.load_balancer.region,
+            'region': CONF.load_balancer.region or CONF.identity.region,
             'endpoint_type': CONF.load_balancer.endpoint_type,
             'build_interval': CONF.load_balancer.build_interval,
             'build_timeout': CONF.load_balancer.build_timeout