openstack
/
tripleo-quickstart-extras
Code Issues Proposed changes

Merge "Fix EXTRA_VARS calculation for env_vars_to_source_file."

This commit is contained in:
Zuul 2018-12-16 10:28:24 +00:00 committed by Gerrit Code Review
parent f91adfab68 9f22651535
commit 67b28e8a9f
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
roles/create-reproducer-script/templates/reproducer-quickstart.sh.j2
View File

@ -326,12 +326,16 @@ export $(awk '/subnode-0/ {print $2}' $WORKSPACE/$HOSTS_FILE)
EXTRA_VARS="$EXTRA_VARS --extra-vars dlrn_hash_tag_newest={{ hostvars['undercloud'].dlrn_hash_newest }} "
{% endif %}
{% if dlrn_hash is defined or ('undercloud' in hostvars and 'dlrn_hash' in hostvars['undercloud']) %}
EXTRA_VARS="$EXTRA_VARS --extra-vars dlrn_hash_tag={{ hostvars['undercloud'].dlrn_hash }}"
{% endif %}
# Create the env_vars_to_source file and copy it to the undercloud
cat >"{{ env_vars_to_source_file }}" <<EOF
export ZUUL_CHANGES="${ZUUL_CHANGES}"
export NODES_FILE="${NODES_FILE}"
export TOCI_JOBTYPE="${TOCI_JOBTYPE}"
export EXTRA_VARS="\$EXTRA_VARS {% if dlrn_hash is defined or ('undercloud' in hostvars and 'dlrn_hash' in hostvars['undercloud']) %}--extra-vars dlrn_hash_tag={{ hostvars['undercloud'].dlrn_hash }}{% endif %} "
export EXTRA_VARS="${EXTRA_VARS}"
export REMAINING_TIME="$TIMEOUT"
export PLAYBOOKS="$PLAYBOOKS"
EOF