openstack
/
tripleo-upgrade
Code Issues Proposed changes

Merge "Fix order for applying workarounds"

This commit is contained in:
Zuul 2019-01-22 12:51:22 +00:00 committed by Gerrit Code Review
parent c5038babb5 9fec3161c6
commit 43157f6a85
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tasks/upgrade/main.yml
View File

@ -121,15 +121,6 @@
include: ceph_upgrade_run.yml
when: ceph_osd_enabled|bool
- name: apply pre overcloud upgrade converge workarounds
shell: |
set -o pipefail
bash {{ working_dir }}/pre_overcloud_upgrade_converge_workarounds.sh 2>&1 {{ timestamper_cmd }} > pre_overcloud_upgrade_converge_workarounds.log
args:
chdir: "{{ working_dir }}"
when: upgrade_workarounds
tags: overcloud_upgrade_converge
- name: apply post Ceph upgrade workarounds
shell: |
set -o pipefail
@ -145,6 +136,15 @@
set -o pipefail
bash {{ working_dir }}/overcloud_online_data_migration.sh 2>&1 {{ timestamper_cmd }} > overcloud_upgrade_data_migration.log
- name: apply pre overcloud upgrade converge workarounds
shell: |
set -o pipefail
bash {{ working_dir }}/pre_overcloud_upgrade_converge_workarounds.sh 2>&1 {{ timestamper_cmd }} > pre_overcloud_upgrade_converge_workarounds.log
args:
chdir: "{{ working_dir }}"
when: upgrade_workarounds
tags: overcloud_upgrade_converge
- include: overcloud_upgrade_converge.yml
tags: overcloud_upgrade_converge