initscript: fix btrfs path default to osd data

And switch to 'osd data' naming throughout.

diff --git a/src/init-ceph b/src/init-ceph
index 1b6dc2579ef8140c79334323ddea4dbfcd278924..0441752ea391322ffb68c3e18afa55ed6c99df96 100755 (executable)
--- a/src/init-ceph
+++ b/src/init-ceph
@@ -148,7 +148,7 @@ for name in $what; do
        module_opt="$mon_addr_arg $osd_data $osd_journal_cmd"
        module_bin="$BINDIR/cosd"
 
-       get_conf btrfs_path "$osd_path" "btrfs path" $sections  # mount point defaults so osd path
+       get_conf btrfs_path "$osd_data" "btrfs path" $sections  # mount point defaults so osd path
        get_conf btrfs_devs "" "btrfs devs" $sections
        first_dev=`echo $btrfs_devs | cut '-d ' -f 1`
     fi
@@ -173,7 +173,7 @@ for name in $what; do
            cmd="$wrap $module_bin $runflags $module_opt $runmode"
            
            echo Starting ceph $name on $host...
-           [ $dobtrfs -eq 1 ] && do_cmd "mount -t btrfs $first_dev $btrfs_path"
+           [ $dobtrfs -eq 1 ] && do_cmd "btrfsctl -a ; mount -t btrfs $first_dev $btrfs_path"
             do_cmd "$cmd"
            ;;
        

diff --git a/src/mkcephfs b/src/mkcephfs
index 87671fa28d6da4cc47f3b05c6445f9bf9009af9b..e075126270bc8ce3f5ca568a293aeb32d145c871 100755 (executable)
--- a/src/mkcephfs
+++ b/src/mkcephfs
@@ -121,8 +121,8 @@ for name in $what; do
     fi
 
     if [[ $type = "osd" ]]; then
-       get_conf osd_path "" "osd data" $sections
-       get_conf btrfs_path "$osd_path" "btrfs path" $sections  # mount point defaults so osd path
+       get_conf osd_data "" "osd data" $sections
+       get_conf btrfs_path "$osd_data" "btrfs path" $sections  # mount point defaults so osd data
        get_conf btrfs_devs "" "btrfs devs" $sections
        first_dev=`echo $btrfs_devs | cut '-d ' -f 1`
        
@@ -131,7 +131,7 @@ for name in $what; do
        fi
 
        [[ $ssh != "" ]] && scp $monmap $host:$monmap
-       do_cmd "$BINDIR/cosd -c $conf_file --monmap_file $monmap --mkfs_for_osd $num $osd_path"
+       do_cmd "$BINDIR/cosd -c $conf_file --monmap_file $monmap --mkfs_for_osd $num $osd_data"
     fi
 
     if [[ $type = "mds" ]]; then