]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
purge-dashboard: remove cid files v4.0.66
authorDimitri Savineau <dsavinea@redhat.com>
Tue, 7 Sep 2021 16:13:37 +0000 (12:13 -0400)
committerDimitri Savineau <savineau.dimitri@gmail.com>
Wed, 8 Sep 2021 16:05:33 +0000 (12:05 -0400)
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

index 97f071d116aeee9830b7eb51560a4bb56d7948b3..14a9fa06705698c013e967d9a7a834fb00451c13 100644 (file)
         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 }}"
 
     - 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 }}"