From: Sage Weil <sage@redhat.com>
Date: Wed, 11 May 2016 13:26:38 +0000 (-0400)
Subject: ceph-crush-location: osd_crush_location -> crush_location
X-Git-Tag: v11.0.0~471^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f9db479a14d9103a2b7c0a24d958fe5fff94100e;p=ceph.git

ceph-crush-location: osd_crush_location -> crush_location

This was indirectly broken for OSDs as of 573c349245b7192d599a8edb15e2dade3e7170c3.

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

diff --git a/PendingReleaseNotes b/PendingReleaseNotes
index 8959684cd99..db109a697ea 100644
--- a/PendingReleaseNotes
+++ b/PendingReleaseNotes
@@ -21,3 +21,5 @@
   change it to a negative value (e.g., -1) to preserve the current
   behavior.
 
+* The `osd crush location` config option is no longer supported.  Please
+  update your ceph.conf to use the `crush location` option instead.
diff --git a/src/ceph-crush-location.in b/src/ceph-crush-location.in
index b5043f269a8..a8c22a8dcf6 100755
--- a/src/ceph-crush-location.in
+++ b/src/ceph-crush-location.in
@@ -68,13 +68,6 @@ if [ -z "$id" ]; then
     usage_exit
 fi
 
-# try a type-specific config, e.g. 'osd crush location'
-location="$($BINDIR/ceph-conf --cluster=${cluster:-ceph} --name=$type.$id --lookup ${type}_crush_location || :)"
-if [ -n "$location" ]; then
-    echo $location
-    exit 0
-fi
-
 # try a generic location
 location="$($BINDIR/ceph-conf --cluster=${cluster:-ceph} --name=$type.$id --lookup crush_location || :)"
 if [ -n "$location" ]; then