From af2372ca4a702da70275edd1b1357fcff51e6ae2 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 11 Feb 2013 17:39:03 -0800 Subject: [PATCH] ceph-disk-prepare: align mkfs, mount config options with mkcephfs 'osd mkfs ...', not 'osd fs mkfs ...'. Sigh. Support both. Signed-off-by: Sage Weil --- src/ceph-disk-prepare | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/src/ceph-disk-prepare b/src/ceph-disk-prepare index e5c4bdb9050..196afe73916 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, -- 2.47.3