openstack/charm-ceph-osd
Code Issues Proposed changes

Allow journal >= 0.48.3

Browse Source
This commit is contained in:
James Page 2013-06-10 14:48:23 +01:00
parent 4ffb232bd8
commit bd60ddebea
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
config.yaml
View File

@ -13,18 +13,18 @@ options:
The device to use as a shared journal drive for all OSD's. By default
no journal device will be used.
.
Only supported with ceph >= 0.55.
Only supported with ceph >= 0.48.3.
osd-format:
type: string
default: xfs
description: |
Format of filesystem to use for OSD devices; supported formats include:
.
xfs (Default >= 0.55)
ext4 (Only option < 0.55)
btrfs (experimental and not recommended)
xfs (Default >= 0.48.3)
ext4 (Only option < 0.48.3)
btrfs (experimental and not recommended)
.
Only supported with ceph >= 0.55.
Only supported with ceph >= 0.48.3.
osd-reformat:
type: string
description: |

2
hooks/hooks.py
View File

@ -140,7 +140,7 @@ def osdize(dev):
cmd = ['ceph-disk-prepare']
# Later versions of ceph support more options
if ceph.get_ceph_version() >= "0.55":
if ceph.get_ceph_version() >= "0.48.3":
osd_format = utils.config_get('osd-format')
if osd_format:
cmd.append('--fs-type')