From: Sage Weil <sage@inktank.com>
Date: Tue, 12 Feb 2013 01:39:03 +0000 (-0800)
Subject: ceph-disk-prepare: align mkfs, mount config options with mkcephfs
X-Git-Tag: v0.58~78^2~13
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=af2372ca4a702da70275edd1b1357fcff51e6ae2;p=ceph.git

ceph-disk-prepare: align mkfs, mount config options with mkcephfs

'osd mkfs ...', not 'osd fs mkfs ...'.  Sigh.  Support both.

Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/ceph-disk-prepare b/src/ceph-disk-prepare
index e5c4bdb9050b..196afe739163 100755
--- a/src/ceph-disk-prepare
+++ b/src/ceph-disk-prepare
@@ -484,24 +484,43 @@ def main():
         if args.fs_type is None:
             args.fs_type = get_conf(
                 cluster=args.cluster,
-                variable='osd_fs_type',
+                variable='osd_mkfs_type',
                 )
+            if args.fs_type is None:
+                args.fs_type = get_conf(
+                    cluster=args.cluster,
+                    variable='osd_fs_type',
+                    )
             if args.fs_type is None:
                 args.fs_type = DEFAULT_FS_TYPE
 
         mkfs_args = get_conf(
             cluster=args.cluster,
-            variable='osd_fs_mkfs_arguments_{fstype}'.format(
+            variable='osd_mkfs_options_{fstype}'.format(
                 fstype=args.fs_type,
                 ),
             )
+        if mkfs_args is None:
+            mkfs_args = get_conf(
+                cluster=args.cluster,
+                variable='osd_fs_mkfs_options_{fstype}'.format(
+                    fstype=args.fs_type,
+                    ),
+                )
 
         mount_options = get_conf(
             cluster=args.cluster,
-            variable='osd_fs_mount_options_{fstype}'.format(
+            variable='osd_mount_options_{fstype}'.format(
                 fstype=args.fs_type,
                 ),
             )
+        if mount_options is None:
+            mount_options = get_conf(
+                cluster=args.cluster,
+                variable='osd_fs_mount_options_{fstype}'.format(
+                    fstype=args.fs_type,
+                    ),
+                )
 
         journal_size = get_conf_with_default(
             cluster=args.cluster,