From: Guillaume Abrioux <gabrioux@redhat.com>
Date: Thu, 11 Apr 2019 15:00:58 +0000 (+0200)
Subject: switch_to_containers: remove ceph-disk references
X-Git-Tag: v4.0.0rc4~28
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f5478dcc0b3df656062823e957d910d99b3c615b;p=ceph-ansible.git

switch_to_containers: remove ceph-disk references

as of stable-4.0, ceph-disk is no longer supported.

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

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 a2dd9c989..4d6168f33 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
@@ -227,21 +227,6 @@
     - import_role:
         name: ceph-defaults
 
-    - name: collect running osds and ceph-disk unit(s)
-      shell: |
-        systemctl list-units | grep "loaded active" | grep -Eo 'ceph-osd@[0-9]+.service|ceph-disk@dev-[a-z]{3,4}[0-9]{1}.service|ceph-volume|ceph\.target'
-      register: running_osds
-      changed_when: false
-      failed_when: false
-
-    - name: stop/disable/mask non-containerized ceph osd(s) and ceph-disk units (if any)
-      systemd:
-        name: "{{ item }}"
-        state: stopped
-        enabled: no
-      with_items: "{{ running_osds.stdout_lines | default([])}}"
-      when: running_osds != []
-
     - name: remove old ceph-osd systemd units
       file:
         path: "{{ item }}"