From edcdbe5601a9aed7770afd8053f2af09e0711f36 Mon Sep 17 00:00:00 2001
From: Guillaume Abrioux <gabrioux@redhat.com>
Date: Fri, 11 Sep 2020 17:30:33 +0200
Subject: [PATCH] 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)
---
 infrastructure-playbooks/purge-cluster.yml           | 3 ++-
 infrastructure-playbooks/purge-container-cluster.yml | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/infrastructure-playbooks/purge-cluster.yml b/infrastructure-playbooks/purge-cluster.yml
index 9178464dd..23d9fab3c 100644
--- a/infrastructure-playbooks/purge-cluster.yml
+++ b/infrastructure-playbooks/purge-cluster.yml
@@ -781,7 +781,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
@@ -789,6 +789,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 db317f99b..9a4d50871 100644
--- a/infrastructure-playbooks/purge-container-cluster.yml
+++ b/infrastructure-playbooks/purge-container-cluster.yml
@@ -656,13 +656,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/*
-- 
2.39.5