From 2d9a5a9d3197f0bc3d50723ec9f0a43d7cf26574 Mon Sep 17 00:00:00 2001
From: "Joshua M. Boniface" <joshua@boniface.me>
Date: Fri, 1 Sep 2023 15:42:26 -0400
Subject: [PATCH] Adjust ordering of flush task

---
 oneshot/update-pvc-cluster.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/oneshot/update-pvc-cluster.yml b/oneshot/update-pvc-cluster.yml
index 26731c9..3c982b8 100644
--- a/oneshot/update-pvc-cluster.yml
+++ b/oneshot/update-pvc-cluster.yml
@@ -68,6 +68,14 @@
         - name: flush node
           command: "pvc node flush {{ ansible_hostname }} --wait"
   
+        - name: make sure node is in flushed state
+          shell: "pvc node info {{ ansible_hostname }} | grep '^Domain State' | awk '{ print $NF }'"
+          register: pvcflush
+          failed_when: pvcflush.stdout != 'flushed'
+          until: pvcflush.stdout == 'flushed'
+          retries: 60
+          delay: 10
+
         - name: ensure VMs are migrated away
           shell: "virsh list | grep running | wc -l"
           register: virshcount
@@ -76,14 +84,6 @@
           retries: 60
           delay: 10
 
-        - name: make sure all VMs have migrated
-          shell: "pvc node info {{ ansible_hostname }} | grep '^Domain State' | awk '{ print $NF }'"
-          register: pvcflush
-          failed_when: pvcflush.stdout != 'flushed'
-          until: pvcflush.stdout == 'flushed'
-          retries: 60
-          delay: 10
-
         - name: wait 15 seconds for system to stabilize
           pause:
             seconds: 15