openstack
/
tripleo-upgrade
Code Issues Proposed changes

Fix order for applying workarounds 

It's needed to apply post-ceph upgrade workarounds after ceph
upgrade is performed, not after pre-converge workarounds are
applied.

Change-Id: I3981324bb092f408dd597d895b2b2017fed516ba
(cherry picked from commit 9fec3161c6)
(cherry picked from commit 617b693edc)
This commit is contained in:
Yurii Prokulevych 2019-01-03 13:19:34 +02:00 committed by Lukas Bezdicka
parent 4cde9c2a60
commit e04385f626
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tasks/upgrade/main.yml
View File

@ -117,6 +117,14 @@
include_tasks: ceph_upgrade_run.yml
when: ceph_osd_enabled|bool
- name: apply post Ceph upgrade workarounds
shell: |
set -o pipefail
bash {{ working_dir }}/post_ceph_upgrade_workarounds.sh 2>&1 {{ timestamper_cmd }} > post_ceph_upgrade_workarounds.log
args:
chdir: "{{ working_dir }}"
when: upgrade_workarounds
- name: apply pre overcloud upgrade converge workarounds
shell: |
set -o pipefail
@ -126,14 +134,6 @@
when: upgrade_workarounds
tags: overcloud_upgrade_converge
- name: apply post Ceph upgrade workarounds
shell: |
set -o pipefail
bash {{ working_dir }}/post_ceph_upgrade_workarounds.sh 2>&1 {{ timestamper_cmd }} > post_ceph_upgrade_workarounds.log
args:
chdir: "{{ working_dir }}"
when: upgrade_workarounds
- include: overcloud_upgrade_converge.yml
tags: overcloud_upgrade_converge