openstack
/
charm-ceph-proxy
Code Issues Proposed changes

Allow osd-format for ceph >= 0.48.3

This commit is contained in:
James Page 2013-06-10 14:46:24 +01:00
parent 2d3d33e587
commit 634688d5aa
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config.yaml
View File

@ -52,11 +52,11 @@ options:
description: | description: |
Format of filesystem to use for OSD devices; supported formats include: Format of filesystem to use for OSD devices; supported formats include:
. .
xfs (Default >= 0.55) xfs (Default >= 0.48.3)
ext4 (Only option < 0.55) ext4 (Only option < 0.48.3)
btrfs (experimental and not recommended) btrfs (experimental and not recommended)
. .
Only supported with ceph >= 0.55. Only supported with ceph >= 0.48.3.
osd-reformat: osd-reformat:
type: string type: string
description: | description: |

2
hooks/hooks.py
View File

@ -183,7 +183,7 @@ def osdize(dev):
cmd = ['ceph-disk-prepare'] cmd = ['ceph-disk-prepare']
# Later versions of ceph support more options # 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') osd_format = utils.config_get('osd-format')
if osd_format: if osd_format:
cmd.append('--fs-type') cmd.append('--fs-type')