From 9fec3161c663b83dae9e881fb8eaa98fa0a06f70 Mon Sep 17 00:00:00 2001
From: Yurii Prokulevych <yprokule@redhat.com>
Date: Thu, 3 Jan 2019 13:19:34 +0200
Subject: [PATCH] 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
---
 tasks/upgrade/main.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/tasks/upgrade/main.yml b/tasks/upgrade/main.yml
index fa90e306..a33eff85 100644
--- a/tasks/upgrade/main.yml
+++ b/tasks/upgrade/main.yml
@@ -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