openstack
/
tripleo-upgrade
Code Issues Proposed changes

Fix RUN_ANSWER unbount variable issue 

Since merging Ibb0676e7a3d97645e4e8a2553e7ec175e96a14b4
"Add --yes into update commands to autoconfirm." into stable/train
my FFU attempts are failing with:
/home/stack/overcloud_system_upgrade-controller-0.sh: line 11: RUN_ANSWER: unbound variable

Reason for this is that RUN_ANSWER gets set only inside the if ceph_osd_enabled
branch, which in my case is false. Let's move setting that variable
outside the if so it gets set everytime.

This script seems to be the only one where it was inadvertently left
inside the if.

Change-Id: I35df29521c1807113710d7d6cc039551400ebe2f
This commit is contained in:
Michele Baldessari 2020-07-14 12:02:44 +02:00
parent fcc34b741c
commit 81314a4546
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
templates/fast-forward-upgrade/overcloud_system_upgrade.sh.j2
View File

@ -14,11 +14,6 @@ if openstack overcloud external-upgrade run --help | grep -qe "--yes"; then
EXTERNAL_ANSWER="--yes"
fi
RUN_ANSWER=""
if openstack overcloud upgrade run --help | grep -qe "--yes"; then
RUN_ANSWER="--yes"
fi
echo "[$(date)] Started ceph systemd units migration run for {{ hosts }}"
openstack overcloud external-upgrade run ${EXTERNAL_ANSWER} \
@ -31,6 +26,11 @@ echo "[$(date)] Finished ceph systemd units migration run for {{ hosts }}"
fi
{% endif -%}
RUN_ANSWER=""
if openstack overcloud upgrade run --help | grep -qe "--yes"; then
RUN_ANSWER="--yes"
fi
echo "[$(date)] Started system upgrade step for {{ hosts }}"
openstack overcloud upgrade run ${RUN_ANSWER} \