From 8ffdec14cfb17f65eb0f9e906f532c1446d9d63c Mon Sep 17 00:00:00 2001
From: Lukas Bezdicka <lbezdick@redhat.com>
Date: Thu, 28 May 2020 10:33:42 +0200
Subject: [PATCH] Run ceph upgrade after converge

We are pushing ceph upgrade step out from converge to:
1) Allow leaving maintenance window and running ceph upgrade later
2) Reset the heat state removing ffwd environment variables and
   setting the heat ceph container image to proper ceph4 version.

Change-Id: Ic623568c6b8048538047d37b6c07f3dcbf2998dc
---
 tasks/fast-forward-upgrade/main.yml | 47 +++++++++++++++--------------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/tasks/fast-forward-upgrade/main.yml b/tasks/fast-forward-upgrade/main.yml
index faa88fc5..6e0a9d97 100644
--- a/tasks/fast-forward-upgrade/main.yml
+++ b/tasks/fast-forward-upgrade/main.yml
@@ -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: