From: Sage Weil <sage@redhat.com>
Date: Tue, 9 Jan 2018 22:28:44 +0000 (-0600)
Subject: init-ceph: drop crush location update
X-Git-Tag: v13.0.2~544^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=60d3312dc2a7616f31a31b4cb6a247fbde7ecde5;p=ceph.git

init-ceph: drop crush location update

OSD.cc does this on its own; no need for this script to be involved.

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

diff --git a/src/init-ceph.in b/src/init-ceph.in
index 26704d62e67..e8c0ada2b3a 100755
--- a/src/init-ceph.in
+++ b/src/init-ceph.in
@@ -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