From: Jan Fajerski Date: Wed, 4 Mar 2020 10:39:40 +0000 (+0100) Subject: ceph-volume: available_lvm: vg space takes precedence X-Git-Tag: v15.2.8~8^2~2 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=15bd005ca75f739209f99e673caf183de798912d;p=ceph.git ceph-volume: available_lvm: vg space takes precedence This changes available_lvm to check for generic reasons only if no VGs were found. A VG can contain a (mounted) lv, which triggers the ro/locked test, despite the VG having space available. Signed-off-by: Jan Fajerski (cherry picked from commit c6d71eb0022935731bb9380098c975d9c5f27a86) Conflicts: src/ceph-volume/ceph_volume/util/device.py pick ours --- diff --git a/src/ceph-volume/ceph_volume/util/device.py b/src/ceph-volume/ceph_volume/util/device.py index 708227e831413..be82a3c31002f 100644 --- a/src/ceph-volume/ceph_volume/util/device.py +++ b/src/ceph-volume/ceph_volume/util/device.py @@ -490,7 +490,6 @@ class Device(object): # only check generic if no vgs are present. Vgs might hold lvs and # that might cause 'locked' to trigger rejected.extend(self._check_generic_reject_reasons()) - return len(rejected) == 0, rejected def _check_raw_reject_reasons(self):