Sync charms.ceph changes

- ensure filestore is used by default
- allow upgrades to luminous

Change-Id: I00aa4fcba53d9bd28592b9ba1b89f74d869148c2
Depends-on: I8205f7c7c63ec30900c4afdc76df174d3d9a8466
This commit is contained in:
Chris MacNaughton 2017-08-16 14:40:19 +02:00
parent 4bcdddc4a3
commit 7384c244ea
1 changed files with 5 additions and 0 deletions

View File

@ -1405,6 +1405,8 @@ def osdize_dev(dev, osd_format, osd_journal, reformat_osd=False,
# NOTE(jamespage): enable experimental bluestore support
if cmp_pkgrevno('ceph', '10.2.0') >= 0 and bluestore:
cmd.append('--bluestore')
elif cmp_pkgrevno('ceph', '12.1.0') >= 0 and not bluestore:
cmd.append('--filestore')
cmd.append(dev)
@ -2061,6 +2063,7 @@ def dirs_need_ownership_update(service):
UPGRADE_PATHS = {
'firefly': 'hammer',
'hammer': 'jewel',
'jewel': 'luminous',
}
# Map UCA codenames to ceph codenames
@ -2072,6 +2075,8 @@ UCA_CODENAME_MAP = {
'mitaka': 'jewel',
'newton': 'jewel',
'ocata': 'jewel',
'pike': 'luminous',
'queens': 'luminous',
}