Merge "[FFWD] Add missing post* workarounds calls."
This commit is contained in:
commit
8858045292
|
@ -20,6 +20,10 @@
|
||||||
when: ffu_noop|bool or ffu_undercloud_upgrade|bool or ffu_overcloud_upgrade|bool
|
when: ffu_noop|bool or ffu_undercloud_upgrade|bool or ffu_overcloud_upgrade|bool
|
||||||
|
|
||||||
- block:
|
- block:
|
||||||
|
- name: apply post ffu undercloud upgrade workarounds
|
||||||
|
command: "{{ working_dir }}/pre_ffu_undercloud_upgrade_workarounds.sh"
|
||||||
|
when: ffu_upgrade_workarounds|bool
|
||||||
|
|
||||||
- name: ffu undercloud upgrade
|
- name: ffu undercloud upgrade
|
||||||
include_tasks: undercloud-upgrade.yml
|
include_tasks: undercloud-upgrade.yml
|
||||||
loop_control:
|
loop_control:
|
||||||
|
@ -73,6 +77,11 @@
|
||||||
import_tasks: ../upgrade/overcloud_upgrade_prepare.yml
|
import_tasks: ../upgrade/overcloud_upgrade_prepare.yml
|
||||||
tags: ffu_overcloud_prepare
|
tags: ffu_overcloud_prepare
|
||||||
|
|
||||||
|
- name: apply post ffu overcloud prepare workarounds
|
||||||
|
command: "{{ working_dir }}/post_ffu_overcloud_prepare_workarounds.sh"
|
||||||
|
when: ffu_upgrade_workarounds|bool
|
||||||
|
tags: ffu_overcloud_prepare
|
||||||
|
|
||||||
- name: stop L3 verification scripts
|
- name: stop L3 verification scripts
|
||||||
include_tasks: "{{ item }}"
|
include_tasks: "{{ item }}"
|
||||||
args:
|
args:
|
||||||
|
@ -96,6 +105,11 @@
|
||||||
command: "{{ working_dir }}/overcloud_upgrade_run.sh"
|
command: "{{ working_dir }}/overcloud_upgrade_run.sh"
|
||||||
tags: ffu_overcloud_run
|
tags: ffu_overcloud_run
|
||||||
|
|
||||||
|
- name: apply post fast forward overcloud upgrade run workarounds
|
||||||
|
command: "{{ working_dir }}/post_ffu_overcloud_run_workarounds.sh"
|
||||||
|
when: ffu_upgrade_workarounds|bool
|
||||||
|
tags: ffu_overcloud_run
|
||||||
|
|
||||||
- name: stop L3 connectivity script
|
- name: stop L3 connectivity script
|
||||||
import_tasks: ../common/l3_agent_connectivity_check_stop_script.yml
|
import_tasks: ../common/l3_agent_connectivity_check_stop_script.yml
|
||||||
tags: ffu_overcloud_run
|
tags: ffu_overcloud_run
|
||||||
|
@ -136,6 +150,11 @@
|
||||||
import_tasks: ../upgrade/ceph_upgrade_run.yml
|
import_tasks: ../upgrade/ceph_upgrade_run.yml
|
||||||
tags: ffu_overcloud_ceph
|
tags: ffu_overcloud_ceph
|
||||||
|
|
||||||
|
- name: apply post ffu ceph upgrade workarounds
|
||||||
|
command: "{{ working_dir }}/post_ffu_overcloud_ceph_workarounds.sh"
|
||||||
|
when: ffu_upgrade_workarounds|bool
|
||||||
|
tags: ffu_overcloud_ceph
|
||||||
|
|
||||||
- name: stop L3 verification scripts
|
- name: stop L3 verification scripts
|
||||||
include_tasks: "{{ item }}"
|
include_tasks: "{{ item }}"
|
||||||
args:
|
args:
|
||||||
|
@ -155,6 +174,11 @@
|
||||||
import_tasks: ../upgrade/overcloud_upgrade_converge.yml
|
import_tasks: ../upgrade/overcloud_upgrade_converge.yml
|
||||||
tags: ffu_overcloud_converge
|
tags: ffu_overcloud_converge
|
||||||
|
|
||||||
|
- name: apply post ffu overcloud converge workarounds
|
||||||
|
command: "{{ working_dir }}/post_ffu_overcloud_converge_workarounds.sh"
|
||||||
|
when: ffu_upgrade_workarounds|bool
|
||||||
|
tags: ffu_overcloud_converge
|
||||||
|
|
||||||
- name: run post upgrade actions
|
- name: run post upgrade actions
|
||||||
import_tasks: ../common/nova_actions_check.yml
|
import_tasks: ../common/nova_actions_check.yml
|
||||||
tags: ffu_overcloud_post
|
tags: ffu_overcloud_post
|
||||||
|
|
|
@ -30,3 +30,8 @@
|
||||||
- '../common/l3_agent_connectivity_check_stop_script.yml'
|
- '../common/l3_agent_connectivity_check_stop_script.yml'
|
||||||
- '../common/l3_agent_failover_check_post_script.yml'
|
- '../common/l3_agent_failover_check_post_script.yml'
|
||||||
tags: ffu_overcloud_upgrade
|
tags: ffu_overcloud_upgrade
|
||||||
|
|
||||||
|
- name: apply post overcloud upgrade run workarounds
|
||||||
|
command: "{{ working_dir }}/post_ffu_overcloud_upgrade_workarounds.sh"
|
||||||
|
when: ffu_upgrade_workarounds|bool
|
||||||
|
tags: ffu_overcloud_upgrade
|
||||||
|
|
|
@ -78,3 +78,8 @@
|
||||||
import_tasks: ../common/l3_agent_connectivity_check_stop_script.yml
|
import_tasks: ../common/l3_agent_connectivity_check_stop_script.yml
|
||||||
tags: ffu_overcloud_upgrade_compute
|
tags: ffu_overcloud_upgrade_compute
|
||||||
when: ffu_computes_rolling|bool
|
when: ffu_computes_rolling|bool
|
||||||
|
|
||||||
|
- name: post controller role upgrade steps workarounds
|
||||||
|
command: "{{ working_dir }}/post_ffu_overcloud_upgrade_workarounds.sh"
|
||||||
|
when: ffu_upgrade_workarounds|bool
|
||||||
|
tags: ffu_overcloud_upgrade_controller
|
||||||
|
|
Loading…
Reference in New Issue