purge: remove potential socket leftover

This commit ensure we remove any socket left by ceph and the
`ceph-osd-run.sh` script.

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1861755
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit 5e91e0f3e24da0492b6f5dd2bc808215b5066ddc)

diff --git a/infrastructure-playbooks/purge-cluster.yml b/infrastructure-playbooks/purge-cluster.yml
index d673e925fc8923a14f8d0dea896bb1fe31e45bd8..59fa61b1938f139e06fa54667b2549fb84f826a2 100644 (file)
--- a/infrastructure-playbooks/purge-cluster.yml
+++ b/infrastructure-playbooks/purge-cluster.yml
@@ -778,7 +778,7 @@
       - ansible_pkg_mgr == 'apt'
       - purge_all_packages == true
 
-  - name: remove config
+  - name: remove config and any ceph socket left
     file:
       path: "{{ item }}"
       state: absent
@@ -786,6 +786,7 @@
       - /etc/ceph
       - /etc/keepalived
       - /etc/haproxy
+      - /run/ceph
 
   - name: remove logs
     file:

diff --git a/infrastructure-playbooks/purge-container-cluster.yml b/infrastructure-playbooks/purge-container-cluster.yml
index 00d655f00bcae437000243d3f5187dad6e9d335c..489650e296564b3c12a5bc13a0861b87814968a6 100644 (file)
--- a/infrastructure-playbooks/purge-container-cluster.yml
+++ b/infrastructure-playbooks/purge-container-cluster.yml
@@ -651,13 +651,15 @@
   become: true
 
   tasks:
-  - name: purge ceph directories for "{{ ansible_hostname }}"
+  - name: purge ceph directories for "{{ ansible_hostname }}" and ceph socket
     file:
       path: "{{ item }}"
       state: absent
     with_items:
       - /etc/ceph
       - /var/log/ceph
+      - /run/ceph
+      - "{{ ceph_osd_docker_run_script_path | default('/usr/share') }}/ceph-osd-run.sh"
 
   - name: remove ceph data
     shell: rm -rf /var/lib/ceph/*