From be091f66d45bee32cc0070f8a10a9e9a1fa83380 Mon Sep 17 00:00:00 2001
From: "Joshua M. Boniface" <joshua@boniface.me>
Date: Fri, 1 Sep 2023 15:42:28 -0400
Subject: [PATCH] Remove pvc-flush references

This service causes more problems than it solves usually, so it is being
removed in the next PVC version.
---
 oneshot/README.md                     |  8 ++++----
 oneshot/reboot-pvc-cluster.yml        | 12 ------------
 oneshot/update-pvc-cluster.yml        | 12 ------------
 oneshot/upgrade-pvc-cluster_deb11.yml | 12 ------------
 roles/pvc/tasks/pvc/bootstrap.yml     |  1 -
 5 files changed, 4 insertions(+), 41 deletions(-)

diff --git a/oneshot/README.md b/oneshot/README.md
index 61a5762..5b7e120 100644
--- a/oneshot/README.md
+++ b/oneshot/README.md
@@ -2,10 +2,12 @@
 
 This directory contains playbooks to assist in automating day-to-day maintenance of a PVC cluster. These playbooks can be used independent of the main `pvc.yml` and roles setup to automate tasks.
 
-## `update-pvc-cluster.yml`
+## `update-pvc-cluster.yml` and `reboot-pvc-cluster.yml`
 
 This playbook performs a sequential full upgrade on all nodes in a PVC cluster.
 
+The `reboot-pvc-cluster.yml` does the same shutdown and restart steps as `update-pvc-cluster.yml`, but forced for all hosts, and without the update part.
+
 ### Running the Playbook
 
 ```
@@ -36,7 +38,7 @@ For each host in the cluster sequentially, do:
 
 1. Flush the node, wait for all VMs to migrate, then wait 15 seconds
 
-1. Stop and disable the `pvc-flush` daemon, stop the `pvcnoded` and `zookeeper` daemons, then wait 15 seconds
+1. Stop the `pvcnoded` and `zookeeper` daemons, then wait 15 seconds
 
 1. Set Ceph OSD `noout` and stop all Ceph OSD, monitor, and manager processes, then wait 30 seconds
 
@@ -46,8 +48,6 @@ For each host in the cluster sequentially, do:
 
 1. Unflush the node, wait for all VMs to migrate, then wait 30 seconds
 
-1. Start and enable the `pvc-flush` daemon
-
 1. Reset any systemd failures
 
 1. Disable cluster maintenance mode, then wait 30 seconds
diff --git a/oneshot/reboot-pvc-cluster.yml b/oneshot/reboot-pvc-cluster.yml
index 1820775..d82de71 100644
--- a/oneshot/reboot-pvc-cluster.yml
+++ b/oneshot/reboot-pvc-cluster.yml
@@ -52,12 +52,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
@@ -150,12 +144,6 @@
       become: no
       connection: local
   
-    - name: start and enable PVC flush daemon cleanly
-      service:
-        name: pvc-flush
-        state: started
-        enabled: yes
-
     - name: reset any systemd failures
       command: systemctl reset-failed
 
diff --git a/oneshot/update-pvc-cluster.yml b/oneshot/update-pvc-cluster.yml
index ab253bc..4a90cd5 100644
--- a/oneshot/update-pvc-cluster.yml
+++ b/oneshot/update-pvc-cluster.yml
@@ -92,12 +92,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
@@ -190,12 +184,6 @@
           become: no
           connection: local
   
-        - name: start and enable PVC flush daemon cleanly
-          service:
-            name: pvc-flush
-            state: started
-            enabled: yes
-
         - name: reset any systemd failures
           command: systemctl reset-failed
       when: freshness.changed
diff --git a/oneshot/upgrade-pvc-cluster_deb11.yml b/oneshot/upgrade-pvc-cluster_deb11.yml
index 6924578..b72697d 100644
--- a/oneshot/upgrade-pvc-cluster_deb11.yml
+++ b/oneshot/upgrade-pvc-cluster_deb11.yml
@@ -44,12 +44,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
@@ -206,12 +200,6 @@
         seconds: 30
       become: no
       connection: local
-  
-    - name: start and enable PVC flush daemon cleanly
-      service:
-        name: pvc-flush
-        state: started
-        enabled: yes
 
     - name: reset any systemd failures
       command: systemctl reset-failed
diff --git a/roles/pvc/tasks/pvc/bootstrap.yml b/roles/pvc/tasks/pvc/bootstrap.yml
index ef8a27c..cdf929a 100644
--- a/roles/pvc/tasks/pvc/bootstrap.yml
+++ b/roles/pvc/tasks/pvc/bootstrap.yml
@@ -46,6 +46,5 @@
     state: stopped
     enabled: yes
   with_items:
-    - pvc-flush.service
     - pvcnoded.service
     - pvc.target