Set regionOne for undercloud and tempest_cloud_name

https://review.openstack.org/#/c/645500/ with this review
if heat is enabled, tempestconf tries to set the conf for
heat tempest plugin where regionOne is required but in
stackrc It is missing which leads to failure for
generating tempest.conf.

Closes-Bug: #1825265

Change-Id: Id7dd0c0902536226aa9874a41407baef2f21f821
Signed-off-by: Chandan Kumar <chkumar@redhat.com>
This commit is contained in:
Chandan Kumar 2019-04-18 19:17:26 +05:30 committed by Chandan Kumar (raukadah)
parent 82c76cd638
commit 254443f7ec
1 changed files with 2 additions and 3 deletions

View File

@ -126,9 +126,10 @@ public_net_id=$(openstack network show provisioning -f value -c id)
public_net_id=$(openstack network show {{ public_net_name }} -f value -c id)
{% endif %}
{% endif %}
region_name=${OS_REGION_NAME:-'regionOne'}
{% endif %}
region_name=${OS_REGION_NAME:-'regionOne'}
{% if not tempest_overcloud|bool %}
# query the endpoint if not set (e.g. clouds.yaml)
export OS_AUTH_URL=${OS_AUTH_URL:-$(openstack endpoint list --service=identity --interface=public -c URL -f value)}
@ -167,9 +168,7 @@ $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 \