openstack/tripleo-quickstart-extras
Code Issues Proposed changes

Merge "Set identity.region with tempestconf explicitly"

Browse Source
This commit is contained in:
Zuul 2018-10-25 09:56:58 +00:00 committed by Gerrit Code Review
commit c60c139547
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
roles/validate-tempest/templates/configure-tempest.sh.j2
View File

@ -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 \