From ac6604ab616e50e09d502011424584f1e37a0297 Mon Sep 17 00:00:00 2001
From: Dimitri Savineau <dsavinea@redhat.com>
Date: Tue, 7 Sep 2021 12:13:37 -0400
Subject: [PATCH] purge-dashboard: remove cid files

This adds the service cid file cleanup as supported in the classic purge
playbook since b9dd253

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1786691

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit cddc23f51134a6a95fd7492ee27a5d89bf7ebf9f)
---
 infrastructure-playbooks/purge-dashboard.yml | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/infrastructure-playbooks/purge-dashboard.yml b/infrastructure-playbooks/purge-dashboard.yml
index c083aeacc..a9e4fbc25 100644
--- a/infrastructure-playbooks/purge-dashboard.yml
+++ b/infrastructure-playbooks/purge-dashboard.yml
@@ -74,10 +74,13 @@
         enabled: no
       failed_when: false
 
-    - name: remove node_exporter service file
+    - name: remove node_exporter service files
       file:
-        name: /etc/systemd/system/node_exporter.service
+        name: "{{ item }}"
         state: absent
+      loop:
+        - /etc/systemd/system/node_exporter.service
+        - /run/node_exporter.service-cid
 
     - name: remove node-exporter image
       command: "{{ container_binary }} rmi {{ node_exporter_container_image }}"
@@ -109,12 +112,15 @@
 
     - name: remove systemd service files
       file:
-        name: "/etc/systemd/system/{{ item }}.service"
+        name: "{{ item }}"
         state: absent
       loop:
-        - alertmanager
-        - prometheus
-        - grafana-server
+        - /etc/systemd/system/alertmanager.service
+        - /etc/systemd/system/prometheus.service
+        - /etc/systemd/system/grafana-server.service
+        - /run/alertmanager.service-cid
+        - /run/prometheus.service-cid
+        - /run/grafana-server.service-cid
 
     - name: remove ceph dashboard container images
       command: "{{ container_binary }} rmi {{ item }}"