From: Dimitri Savineau <dsavinea@redhat.com>
Date: Wed, 20 Mar 2019 17:40:33 +0000 (-0400)
Subject: purge-docker-cluster: Remove ceph-osd service
X-Git-Tag: v3.2.11~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8e2cfd9d24e40b476df5a6bc8afef3a3a90ce978;p=ceph-ansible.git

purge-docker-cluster: Remove ceph-osd service

The systemd ceph-osd@.service file used for starting the ceph osd
containers is used in all osd_scenarios.
Currently purging a containerized deployment using the lvm scenario
didn't remove the ceph-osd systemd service.
If the next deployment is a non-containerized deployment, the OSDs
won't be online because the file is still present and override the
one from the package.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit 7cc626b72dbb242a00f714d925b6aea6b4524c37)
---

diff --git a/infrastructure-playbooks/purge-docker-cluster.yml b/infrastructure-playbooks/purge-docker-cluster.yml
index 37764d099..3b886ddfd 100644
--- a/infrastructure-playbooks/purge-docker-cluster.yml
+++ b/infrastructure-playbooks/purge-docker-cluster.yml
@@ -444,11 +444,6 @@
             state: absent
           with_items:
             - "{{ resolved_parent_device }}"
-
-        - name: remove ceph osd service
-          file:
-            path: /etc/systemd/system/ceph-osd@.service
-            state: absent
       when:
         - osd_scenario != "lvm"
 
@@ -483,6 +478,11 @@
       when:
         - osd_scenario == "lvm"
 
+    - name: remove ceph osd service
+      file:
+        path: /etc/systemd/system/ceph-osd@.service
+        state: absent
+
     - name: remove ceph osd image
       docker_image:
         state: absent