From a8a25b213476b89df9449aca7ba4fcbe4f85b876 Mon Sep 17 00:00:00 2001
From: Chris MacNaughton <chris.macnaughton@canonical.com>
Date: Mon, 11 May 2020 10:02:42 +0200
Subject: [PATCH] Handle leader prepare step before non-leaders

---
 zaza/openstack/utilities/parallel_series_upgrade.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zaza/openstack/utilities/parallel_series_upgrade.py b/zaza/openstack/utilities/parallel_series_upgrade.py
index ba8b205..aa6ab0e 100755
--- a/zaza/openstack/utilities/parallel_series_upgrade.py
+++ b/zaza/openstack/utilities/parallel_series_upgrade.py
@@ -212,11 +212,11 @@ async def parallel_series_upgrade(
         for unit in status["units"]
     ]
     await asyncio.gather(*app_idle)
+    await prepare_series_upgrade(leader_machine, to_series=to_series)
     prepare_group = [
         prepare_series_upgrade(machine, to_series=to_series)
         for machine in machines]
     await asyncio.gather(*prepare_group)
-    await prepare_series_upgrade(leader_machine, to_series=to_series)
     if leader_machine not in completed_machines:
         machines.append(leader_machine)
     upgrade_group = [