]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
switch_to_containers: remove ceph-disk references
authorGuillaume Abrioux <gabrioux@redhat.com>
Thu, 11 Apr 2019 15:00:58 +0000 (17:00 +0200)
committermergify[bot] <mergify[bot]@users.noreply.github.com>
Fri, 12 Apr 2019 00:45:21 +0000 (00:45 +0000)
as of stable-4.0, ceph-disk is no longer supported.

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

infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml

index a2dd9c9891fc3d97d3e25f0c60b2652c9f7bab13..4d6168f33c3abc1dbc57f0246f80a17a88bf2fd8 100644 (file)
     - 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 }}"