openstack
/
tripleo-upgrade
Code Issues Proposed changes

Merge "Run ceph upgrade after converge"

This commit is contained in:
Zuul 2020-06-03 15:20:53 +00:00 committed by Gerrit Code Review
parent 4b77179278 8ffdec14cf
commit f7b2a5bf1f
1 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
tasks/fast-forward-upgrade/main.yml
View File

@ -174,6 +174,29 @@
# tags: ffu_overcloud_upgrade_bulk
# when: ffu_bulk|bool
################ UPGRADE CONVERGE ###############
- name: apply pre ffu overcloud converge workarounds
shell: |
set -o pipefail
bash pre_ffu_overcloud_converge_workarounds.sh 2>&1 {{ timestamper_cmd }} > pre_ffu_overcloud_converge_workarounds.log
args:
chdir: "{{ working_dir }}"
when: ffu_upgrade_workarounds|bool
tags: ffu_overcloud_converge
- name: import overcloud upgrade converge tasks
import_tasks: ../upgrade/overcloud_upgrade_converge.yml
tags: ffu_overcloud_converge
- name: apply post ffu overcloud converge workarounds
shell: |
set -o pipefail
bash post_ffu_overcloud_converge_workarounds.sh 2>&1 {{ timestamper_cmd }} > post_ffu_overcloud_converge_workarounds.log
args:
chdir: "{{ working_dir }}"
when: ffu_upgrade_workarounds|bool
tags: ffu_overcloud_converge
############## CEPH upgrade ######################
- when: ceph_osd_enabled|bool
block:
@ -217,29 +240,7 @@
- '../common/l3_agent_failover_check_post_script.yml'
tags: ffu_overcloud_ceph
################ UPGRADE CONVERGE ###############
- name: apply pre ffu overcloud converge workarounds
shell: |
set -o pipefail
bash pre_ffu_overcloud_converge_workarounds.sh 2>&1 {{ timestamper_cmd }} > pre_ffu_overcloud_converge_workarounds.log
args:
chdir: "{{ working_dir }}"
when: ffu_upgrade_workarounds|bool
tags: ffu_overcloud_converge
- name: import overcloud upgrade converge tasks
import_tasks: ../upgrade/overcloud_upgrade_converge.yml
tags: ffu_overcloud_converge
- name: apply post ffu overcloud converge workarounds
shell: |
set -o pipefail
bash post_ffu_overcloud_converge_workarounds.sh 2>&1 {{ timestamper_cmd }} > post_ffu_overcloud_converge_workarounds.log
args:
chdir: "{{ working_dir }}"
when: ffu_upgrade_workarounds|bool
tags: ffu_overcloud_converge
############## POST UPGRADE ##############
- name: run controller post upgrade steps
include_tasks: ../upgrade/controller_post_upgrade.yml
args: