From 2824be4d63eb7a8ed1e7902397dec6a730d78887 Mon Sep 17 00:00:00 2001
From: Rabi Mishra <ramishra@redhat.com>
Date: Mon, 22 Oct 2018 11:09:29 +0530
Subject: [PATCH] Set identity.region with tempestconf explicitly

When running tempest set the identity.region explicitly as
it's not picked from the rc file.

Change-Id: I3374bdb52838572e267788e183b5f1eff9a14ec9
---
 roles/validate-tempest/templates/configure-tempest.sh.j2 | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/roles/validate-tempest/templates/configure-tempest.sh.j2 b/roles/validate-tempest/templates/configure-tempest.sh.j2
index a978f1661..4b3d8fc8f 100644
--- a/roles/validate-tempest/templates/configure-tempest.sh.j2
+++ b/roles/validate-tempest/templates/configure-tempest.sh.j2
@@ -107,6 +107,7 @@ public_net_id=$(neutron net-show {{ public_net_name }} -f value -c id)
 {% else %}
 public_net_id=$(openstack network show {{ public_net_name }} -f value -c id)
 {% endif %}
+region_name=${OS_REGION_NAME:-'regionOne'}
 {% endif %}
 
 {% if not tempest_overcloud|bool %}
@@ -147,6 +148,9 @@ $TEMPESTCONF --out etc/tempest.conf \
   DEFAULT.log_dir {{ tempest_log_dir }} \
   DEFAULT.log_file {{ tempest_log_file }} \
   {% endif %}
+  {% if tempest_os_cloud != '' %}
+  identity.region $region_name \
+  {% endif %}
   {% if release in ['newton', 'ocata', 'pike'] %}
   identity.uri $OS_AUTH_URL \
   identity.admin_password $OS_PASSWORD \