From 0ddd11844e6b878456d3bbb5b725363c72490c34 Mon Sep 17 00:00:00 2001
From: "Joshua M. Boniface" <joshua@boniface.me>
Date: Fri, 1 Sep 2023 15:42:25 -0400
Subject: [PATCH] Reorder Ceph stop and lower some waits

---
 oneshot/update-pvc-cluster.yml | 42 +++++++++++++++++++---------------
 1 file changed, 24 insertions(+), 18 deletions(-)

diff --git a/oneshot/update-pvc-cluster.yml b/oneshot/update-pvc-cluster.yml
index a93046a..e37d466 100644
--- a/oneshot/update-pvc-cluster.yml
+++ b/oneshot/update-pvc-cluster.yml
@@ -64,9 +64,31 @@
           retries: 60
           delay: 10
 
-        - name: wait 30 seconds for system to stabilize
+        - name: wait 15 seconds for system to stabilize
           pause:
-            seconds: "30"
+            seconds: "15"
+          become: no
+          connection: local
+
+        - name: stop and disable PVC flush daemon cleanly
+          service:
+            name: "pvc-flush"
+            state: stopped
+            enabled: no
+
+        - name: stop PVC daemon cleanly
+          service:
+            name: "pvcnoded"
+            state: stopped
+
+        - name: stop Zookeeper daemon cleanly
+          service:
+            name: "zookeeper"
+            state: stopped
+
+        - name: wait 15 seconds for system to stabilize
+          pause:
+            seconds: "15"
           become: no
           connection: local
 
@@ -103,22 +125,6 @@
           become: no
           connection: local
 
-        - name: stop and disable PVC flush daemon cleanly
-          service:
-            name: "pvc-flush"
-            state: stopped
-            enabled: no
-
-        - name: stop PVC daemon cleanly
-          service:
-            name: "pvcnoded"
-            state: stopped
-
-        - name: stop Zookeeper daemon cleanly
-          service:
-            name: "zookeeper"
-            state: stopped
-
         - name: restart system
           reboot:
             post_reboot_delay: 15