From: Sébastien Han <seb@redhat.com>
Date: Mon, 13 Aug 2018 13:54:37 +0000 (+0200)
Subject: Revert "osd: generate device list for osd_auto_discovery on rolling_update"
X-Git-Tag: v3.2.0beta2~61
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=3149b2564fb89f2352820d83be02c09f658bdf60;p=ceph-ansible.git

Revert "osd: generate device list for osd_auto_discovery on rolling_update"

This reverts commit e84f11e99ef42057cd1c3fbfab41ef66cda27302.

This commit was giving a new failure later during the rolling_update
process. Basically, this was modifying the list of devices and started
impacting the ceph-osd itself. The modification to accomodate the
osd_auto_discovery parameter should happen outside of the ceph-osd.

Also we are trying to not play ceph-osd role during the rolling_update
process so we can speed up the upgrade.

Signed-off-by: Sébastien Han <seb@redhat.com>
---

diff --git a/roles/ceph-osd/tasks/build_devices.yml b/roles/ceph-osd/tasks/build_devices.yml
index 367b47355..b578c320f 100644
--- a/roles/ceph-osd/tasks/build_devices.yml
+++ b/roles/ceph-osd/tasks/build_devices.yml
@@ -12,18 +12,6 @@
     - item.value.holders|count == 0
     - "'dm-' not in item.key"
 
-- name: set_fact devices generate device list when osd_auto_discovery - rolling_update
-  set_fact:
-    devices: "{{ devices | default([]) + [ item.key | regex_replace('^', '/dev/') ] }}"
-  with_dict: "{{ ansible_devices }}"
-  when:
-    - osd_auto_discovery
-    - rolling_update
-    - ansible_devices is defined
-    - "'dm-' not in item.key"
-    - item.value.removable == "0"
-    - item.value.sectors != "0"
-
 - name: resolve dedicated device link(s)
   command: readlink -f {{ item }}
   changed_when: false