]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
purge-dashboard: remove cid files
authorDimitri Savineau <dsavinea@redhat.com>
Tue, 7 Sep 2021 16:13:37 +0000 (12:13 -0400)
committerGuillaume Abrioux <gabrioux@redhat.com>
Wed, 8 Sep 2021 13:40:46 +0000 (15:40 +0200)
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>
infrastructure-playbooks/purge-dashboard.yml

index c083aeacc37a896acf374ea4c0bdf2f6fbb65e35..a9e4fbc25fe3f1d737f6040afe0e8839b591a7c3 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 }}"