openstack
/
tripleo-quickstart-extras
Code Issues Proposed changes

Fix nits with configure-tempest 

See comments from https://review.openstack.org/#/c/600586

Change-Id: Ida8529beb06bf9ba525c7abac625abed87d0e4da
This commit is contained in:
Alex Schultz 2018-09-14 10:59:07 -06:00
parent 14243ab998
commit d2389fbfe1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,7 +17,7 @@ sudo rm -rf {{ working_dir }}/tempest_data
# Cloud Credentials
{% if tempest_os_cloud is defined and tempest_os_cloud != '' %}
{% if tempest_os_cloud != '' %}
export OS_CLOUD={{ tempest_os_cloud }}
{% else %}
source {{ rc_file }}
@ -95,7 +95,7 @@ popd
## ::
export TEMPESTCONF="{{ tempestconf }}"
{% if not tempest_os_cloud != '' %}
{% if tempest_os_cloud == '' %}
source {{ rc_file }}
{% endif %}
@ -131,7 +131,7 @@ $TEMPESTCONF --out etc/tempest.conf \
--deployer-input {{ working_dir }}/{{ tempest_deployer_input_file }} \
--network-id $public_net_id \
{% endif %}
{% if tempest_os_cloud %}
{% if tempest_os_cloud != '' %}
--os-cloud {{ tempest_os_cloud }} \
{% endif %}
--image {{ tempest_test_image_path }} \