Allow running update/upgrade converge with --update-plan-only

We discovered we need to put back stack updates into the converge
operations. This increases the run time of the upgrade procedure
considerably, and e.g. our voting CI job for updates might go over the
time limit. We'll need to start passing --update-plan-only to the
converge operation to keep CI on previous run times.

Depends-On: Idc5dbebc116aba2420d275aab3981186511f298e
Change-Id: I9039db99f43e8ad091ea6fef7e3a149fcddf1334
Related-Bug: #1768586
(cherry picked from commit dea69896c4)
This commit is contained in:
Jiri Stransky 2018-05-03 11:38:13 +02:00 committed by Carlos Camacho
parent 74c713c88d
commit 468257d2f4
2 changed files with 9 additions and 0 deletions

View File

@ -187,6 +187,12 @@ tripleo_upgrade_debug: false
# independently in spite of validation errors.
tripleo_upgrade_validations_non_fatal: false
# When set to true, the converge operations (update, upgrade, ffwd)
# will run with --update-plan-only. This does not provide full
# verification of the process, but might be necessary to fit within a
# reasonable job run time for gating.
tripleo_upgrade_converge_plan_only: false
## If set to true, overcloud upgrade will be run for each of the
# playbooks defined in 'overcloud_upgrade_playbooks', otherwise
# 'all' will be passed into --playbooks option.

View File

@ -18,6 +18,9 @@ openstack overcloud {% if ffu_overcloud_upgrade %} ffwd-upgrade {% else %} upgra
{% endif %}
{% if tripleo_upgrade_validations_non_fatal|bool %}
--validation-errors-nonfatal \
{% endif %}
{% if tripleo_upgrade_converge_plan_only|bool %}
--update-plan-only \
{% endif %}
--templates {{ tht_directory }} \
--stack {{ overcloud_stack_name }} \