openstack
/
tripleo-upgrade
Code Issues Proposed changes

Fix a nit in the oooq transformation process. 

This would result in a file having the compute node and the
environment files on the same line:

  --compute-scale 0  -e /opt/stack/new/tripleo-ci/test-environments/worker-config.yaml \

which could lead later on to improper parsing[1]

[1] https://logs.rdoproject.org/55/559755/3/openstack-check/gate-tripleo-ci-centos-7-container-to-container-upgrades-master-nv/Zd4c2be456ed34d239b58e830288b2421/undercloud/home/jenkins/overcloud_upgrade_prepare.sh.txt.gz

Change-Id: I5e9cf01e706411406b953d4c1a8e7443b328edd2
(cherry picked from commit ca46430dd2)
This commit is contained in:
Sofer Athlan-Guyot 2018-04-10 18:41:53 +02:00 committed by Yurii Prokulevych
parent 8fd3507ffa
commit 9c3c90ca2f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
templates/oooq_deploy_transformation.sh.j2
View File

@ -4,7 +4,7 @@ awk '/status_code/{inside=0}
/^openstack overcloud deploy/{inside=1}
{if (inside==1) {print}}' {{ working_dir }}/overcloud-deploy.sh > /tmp/overcloud-deploy-tr.1
sed -Ee 's/([a-zA-Z1-9]) +([-][^ ])/\1 \\\n\2/g' /tmp/overcloud-deploy-tr.1 > /tmp/overcloud-deploy-tr.2
sed -Ee 's/([a-zA-Z0-9]) +([-][^ ])/\1 \\\n\2/g' /tmp/overcloud-deploy-tr.1 > /tmp/overcloud-deploy-tr.2
# Check if tripleo-heat-templates directory used for deployment
# in deploy-overcloud.sh matches with one specified under {{ tht_directory }}