From 98183011bba073d6665780083ca54413d82d8dcf Mon Sep 17 00:00:00 2001 From: Chris MacNaughton Date: Fri, 15 Mar 2019 14:02:26 +0100 Subject: [PATCH] Update bluestore checks to match what we use in ceph-osd hooks Change-Id: I2ea119f5a1b2a36ccd36df4db094f208a1db100e Closes-Bug: #1820271 --- ceph/utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ceph/utils.py b/ceph/utils.py index b4f8790..e1b6282 100644 --- a/ceph/utils.py +++ b/ceph/utils.py @@ -1555,7 +1555,7 @@ def _ceph_disk(dev, osd_format, osd_journal, encrypt=False, bluestore=False): cmd.append(osd_format) # NOTE(jamespage): enable experimental bluestore support - if cmp_pkgrevno('ceph', '10.2.0') >= 0 and bluestore: + if cmp_pkgrevno('ceph', '12.2.0') >= 0 and bluestore: cmd.append('--bluestore') wal = get_devices('bluestore-wal') if wal: @@ -1567,7 +1567,7 @@ def _ceph_disk(dev, osd_format, osd_journal, encrypt=False, bluestore=False): cmd.append('--block.db') least_used_db = find_least_used_utility_device(db) cmd.append(least_used_db) - elif cmp_pkgrevno('ceph', '12.1.0') >= 0 and not bluestore: + elif cmp_pkgrevno('ceph', '12.2.0') >= 0 and not bluestore: cmd.append('--filestore') cmd.append(os.path.realpath(dev))