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 367b47355f7926421424af649df60880b0637808..b578c320f6b69074aacb2778b52b7775741d3c45 100644 (file)
--- 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