openstack/tripleo-quickstart-extras
Code Issues Proposed changes

Merge "Set regionOne for undercloud and tempest_cloud_name"

Browse Source
This commit is contained in:
Zuul 2019-04-22 13:09:57 +00:00 committed by Gerrit Code Review
commit 1aa9747a4e
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
roles/validate-tempest/templates/configure-tempest.sh.j2
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 \