From 634688d5aa9cfc425cb8806d208800f5ca58c43c Mon Sep 17 00:00:00 2001
From: James Page <james.page@canonical.com>
Date: Mon, 10 Jun 2013 14:46:24 +0100
Subject: [PATCH] Allow osd-format for ceph >= 0.48.3

---
 config.yaml    | 6 +++---
 hooks/hooks.py | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/config.yaml b/config.yaml
index 7b2f56d..cbc62b4 100644
--- a/config.yaml
+++ b/config.yaml
@@ -52,11 +52,11 @@ options:
     description: |
       Format of filesystem to use for OSD devices; supported formats include:
       .
-        xfs (Default >= 0.55)
-        ext4 (Only option < 0.55)
+        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: |
diff --git a/hooks/hooks.py b/hooks/hooks.py
index 08e8d91..8f72c25 100755
--- a/hooks/hooks.py
+++ b/hooks/hooks.py
@@ -183,7 +183,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')