mkcephfs: use default osd_data, _journal values

Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>

diff --git a/src/mkcephfs.in b/src/mkcephfs.in
index 7e32d6a79aee80676cbed4163000b1a4234324ad..c507709e81a385286f2a107eff9b613429015aa7 100644 (file)
--- a/src/mkcephfs.in
+++ b/src/mkcephfs.in
@@ -304,8 +304,8 @@ if [ -n "$prepareosdfs" ]; then
     id=`echo $name | cut -c 4- | sed 's/^\\.//'`
     name="$type.$id"
 
-    get_conf osd_data "" "osd data"
-    get_conf osd_journal "" "osd journal"
+    get_conf osd_data "/var/lib/ceph/osd/ceph-$id" "osd data"
+    get_conf osd_journal "$osd_data/journal" "osd journal"
     get_conf btrfs_path "$osd_data" "btrfs path"  # mount point defaults so osd data
     get_conf btrfs_devs "" "btrfs devs"