openstack
/
charms.ceph
Code Issues Proposed changes

Update bluestore checks to match what we use in ceph-osd hooks 

Change-Id: I2ea119f5a1b2a36ccd36df4db094f208a1db100e
Closes-Bug: #1820271
This commit is contained in:
Chris MacNaughton 2019-03-15 14:02:26 +01:00
parent 203840bd69
commit 98183011bb
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ceph/utils.py
View File

@ -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))