openstack
/
charm-ceph-osd
Code Issues Proposed changes

Merge 0.48.3 XFS and osd-format support.

This commit is contained in:
Adam Gandelman 2013-06-10 10:55:40 -07:00
parent df28cb6218 bd60ddebea
commit 8e15ead175
2 changed files with 8 additions and 7 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: |

5
hooks/hooks.py
View File

@ -27,7 +27,7 @@ def install_upstart_scripts():
def install():
utils.juju_log('INFO', 'Begin install hook.')
utils.configure_source()
utils.install('ceph', 'gdisk', 'ntp', 'btrfs-tools')
utils.install('ceph', 'gdisk', 'ntp', 'btrfs-tools', 'xfsprogs')
install_upstart_scripts()
utils.juju_log('INFO', 'End install hook.')
@ -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')
@ -191,6 +191,7 @@ def upgrade_charm():
get_auth()):
emit_cephconf()
install_upstart_scripts()
utils.install('xfsprogs')
utils.juju_log('INFO', 'End upgrade-charm hook.')