update sources to ceph Nautilus 14.2.1

[ceph.git] / ceph / src / init-ceph.in

diff --git a/ceph/src/init-ceph.in b/ceph/src/init-ceph.in
index 26704d62e67355f9ef3ce8ec575c4fed398ccb50..184371006918861fde999a0618bc37d0f6cdc080 100755 (executable)
--- a/ceph/src/init-ceph.in
+++ b/ceph/src/init-ceph.in
@@ -34,7 +34,7 @@ else
        ETCDIR=.
        ASSUME_DEV=1
        CEPH_LIB=$CEPH_ROOT/build/lib
-       echo "$PYTHONPATH" | grep -q $CEPH_LIB || export PYTHONPATH=$CEPH_LIB/cython_modules/lib.2:$PYTHONPATH
+       echo "$PYTHONPATH" | grep -q $CEPH_LIB || export PYTHONPATH=$CEPH_LIB/cython_modules/lib.@MGR_PYTHON_VERSION_MAJOR@:$PYTHONPATH
        echo "$LD_LIBRARY_PATH" | grep -q $CEPH_LIB || export LD_LIBRARY_PATH=$CEPH_LIB:$LD_LIBRARY_PATH
        echo "$DYLD_LIBRARY_PATH" | grep -q $CEPH_LIB || export DYLD_LIBRARY_PATH=$CEPH_LIB:$DYLD_LIBRARY_PATH
     else
@@ -418,27 +418,6 @@ for name in $what; do
                fi
            fi
 
-           if [ "$type" = "osd" ]; then
-               get_conf update_crush "" "osd crush update on start"
-               case "${update_crush:-1}" in 1|[Tt][Rr][Uu][Ee])
-                   # update location in crush
-                   get_conf osd_location_hook "$BINDIR/ceph-crush-location" "osd crush location hook"
-                   if [ ! -e "$osd_location_hook" ]; then
-                       EXIT_STATUS=2
-                       continue
-                   fi
-                   osd_location=`$osd_location_hook --cluster $cluster --id $id --type osd`
-                   get_conf osd_weight "" "osd crush initial weight"
-                   defaultweight="$(df -P -k $osd_data/. | tail -1 | awk '{ print sprintf("%.4f",$2/1073741824) }')"
-                   get_conf osd_keyring "$osd_data/keyring" "keyring"
-                   do_cmd_okfail "timeout 30 $BINDIR/ceph -c $conf --name=osd.$id --keyring=$osd_keyring osd crush create-or-move -- $id ${osd_weight:-${defaultweight:-1}} $osd_location"
-                   if [ "$ERR" != "0" ]; then
-                       EXIT_STATUS=$ERR
-                       continue
-                   fi
-               esac
-           fi
-
            echo Starting Ceph $name on $host...
            if [ ! -d $run_dir ]; then
                # assume /var/run exists
@@ -543,13 +522,4 @@ for name in $what; do
     esac
 done
 
-# activate latent osds?
-if [ "$command" = "start" -a "$BINDIR" != "." ]; then
-    if [ "$*" = "" ] || echo $* | grep -q ^osd\$ ; then
-       if [ -x $SBINDIR/ceph-disk ]; then
-           ceph-disk activate-all
-       fi
-    fi
-fi
-
 exit $EXIT_STATUS