From: Guillaume Abrioux <gabrioux@redhat.com>
Date: Thu, 26 Nov 2020 09:11:36 +0000 (+0100)
Subject: switch2containers: do not stop ceph.target in osd play
X-Git-Tag: v4.0.42~19
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=1ac034a80213899b02000fb6f13d9d29423ac91c;p=ceph-ansible.git

switch2containers: do not stop ceph.target in osd play

`ceph.target` should be disabled only. Otherwise, in collocation
scenario you stop other collocated services in the OSD play which isn't
what we want to do. Each daemon has its corresponding play for managing
the transition to container.

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1901865

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit 0b05620597121c6388b7fbf227fb01f8efb2bda6)
---

diff --git a/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml b/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml
index 5f70e23fb..8ad11e41b 100644
--- a/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml
+++ b/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml
@@ -234,7 +234,7 @@
 
     - name: collect running osds
       shell: |
-        systemctl list-units | grep -E "loaded * active" | grep -Eo 'ceph-osd@[0-9]+.service|ceph-volume|ceph\.target'
+        systemctl list-units | grep -E "loaded * active" | grep -Eo 'ceph-osd@[0-9]+.service|ceph-volume'
       register: running_osds
       changed_when: false
       failed_when: false
@@ -255,6 +255,11 @@
       with_items: "{{ running_osds.stdout_lines | default([])}}"
       when: running_osds != []
 
+    - name: disable ceph.target
+      systemd:
+        name: ceph.target
+        enabled: no
+
     - name: remove old ceph-osd systemd units
       file:
         path: "{{ item }}"