From 3149b2564fb89f2352820d83be02c09f658bdf60 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Han?= Date: Mon, 13 Aug 2018 15:54:37 +0200 Subject: [PATCH] Revert "osd: generate device list for osd_auto_discovery on rolling_update" MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 --- roles/ceph-osd/tasks/build_devices.yml | 12 ------------ 1 file changed, 12 deletions(-) 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 -- 2.39.5