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

ceph-crush-location: remove

This script is pointless.  It is equivalent to the built-in default
behavior, which makes it only useful as a sample for what a location
hook's output should be.  The documentation has been updated to provide
that.

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

diff --git a/PendingReleaseNotes b/PendingReleaseNotes
index b48eb44cf70ba..1b30751de3b1e 100644
--- a/PendingReleaseNotes
+++ b/PendingReleaseNotes
@@ -1,4 +1,4 @@
-13.0.0
+13.0.1
 ------
 
 * The RBD C API's rbd_discard method now enforces a maximum length of
@@ -25,6 +25,10 @@
     mds_session_timeout, mds_session_autoclose, and mds_max_file_size are now
     obsolete.
 
+* The sample ``crush-location-hook`` script has been removed.  Its output is
+  equivalent to the built-in default behavior, so it has been replaced with an
+  example in the CRUSH documentation.
+
 
 
 >= 12.2.2
diff --git a/alpine/APKBUILD.in b/alpine/APKBUILD.in
index e82dd20a50cfd..47d2d586a5410 100644
--- a/alpine/APKBUILD.in
+++ b/alpine/APKBUILD.in
@@ -216,7 +216,6 @@ common() {
 		ceph-dencoder \
 		ceph-rbdnamer \
 		ceph-syn \
-		ceph-crush-location \
 		cephfs-data-scan \
 		cephfs-journal-tool \
 		cephfs-table-tool \
diff --git a/ceph.spec.in b/ceph.spec.in
index 0b0a506969efc..03f3f302f15d6 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -1066,7 +1066,6 @@ fi
 %{_bindir}/ceph-dencoder
 %{_bindir}/ceph-rbdnamer
 %{_bindir}/ceph-syn
-%{_bindir}/ceph-crush-location
 %{_bindir}/cephfs-data-scan
 %{_bindir}/cephfs-journal-tool
 %{_bindir}/cephfs-table-tool
diff --git a/debian/ceph-common.install b/debian/ceph-common.install
index 11e24f49472ad..afba9d9024094 100755
--- a/debian/ceph-common.install
+++ b/debian/ceph-common.install
@@ -10,7 +10,6 @@ usr/bin/ceph-conf
 usr/bin/ceph-dencoder
 usr/bin/ceph-rbdnamer
 usr/bin/ceph-syn
-usr/bin/ceph-crush-location
 usr/bin/cephfs-data-scan
 usr/bin/cephfs-journal-tool
 usr/bin/cephfs-table-tool
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6337805198eab..f202c12e07163 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -926,9 +926,6 @@ endif()
 configure_file(${CMAKE_SOURCE_DIR}/src/ceph.in
   ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ceph @ONLY)
 
-configure_file(${CMAKE_SOURCE_DIR}/src/ceph-crush-location.in
-  ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ceph-crush-location @ONLY)
-
 configure_file(${CMAKE_SOURCE_DIR}/src/init-ceph.in
   ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/init-ceph @ONLY)
 
@@ -944,7 +941,6 @@ endif()
 
 install(PROGRAMS
   ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ceph
-  ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ceph-crush-location
   ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ceph-post-file
   ${CMAKE_SOURCE_DIR}/src/ceph-run
   ${CMAKE_SOURCE_DIR}/src/ceph-rest-api
diff --git a/src/ceph-crush-location.in b/src/ceph-crush-location.in
deleted file mode 100755
index a8c22a8dcf687..0000000000000
--- a/src/ceph-crush-location.in
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/bin/sh
-#
-# Generate a CRUSH location for the given entity
-#
-# The CRUSH location consists of a list of key=value pairs, separated
-# by spaces, all on a single line.  This describes where in CRUSH
-# hierarhcy this entity should be placed.
-#
-# Arguments:
-#   --cluster <clustername>   name of the cluster (see /etc/ceph/$cluster.conf)
-#   --type <osd|mds|client>   daemon/entity type
-#   --id <id>                 id (osd number, mds name, client name)
-#
-
-# if we start up as ./ceph-crush-location, assume everything else is
-# in the current directory too.
-if [ `dirname $0` = "." ] && [ $PWD != "/usr/bin" ]; then
-    BINDIR=.
-    SBINDIR=.
-    LIBDIR=.
-    ETCDIR=.
-else
-    BINDIR=@bindir@
-    SBINDIR=@prefix@/sbin
-    LIBDIR=@libdir@/ceph
-    ETCDIR=@sysconfdir@/ceph
-fi
-
-usage_exit() {
-    echo "usage: $0 [--cluster <cluster>] --id <id> --type <osd|mds|client>"
-    exit
-}
-
-cluster="ceph"
-type=""
-id=""
-while [ $# -ge 1 ]; do
-    case $1 in
-	--cluster | -C)
-	    shift
-	    cluster="$1"
-	    shift
-	    ;;
-	--id | -i)
-	    shift
-	    id="$1"
-	    shift
-	    ;;
-	--type | -t)
-	    shift
-	    type="$1"
-	    shift
-	    ;;
-	*)
-	    echo "unrecognized option '$1'"
-	    usage_exit
-	    ;;
-    esac
-done
-
-if [ -z "$type" ]; then
-    echo "must specify entity type"
-    usage_exit
-fi
-
-if [ -z "$id" ]; then
-    echo "must specify id"
-    usage_exit
-fi
-
-# try a generic location
-location="$($BINDIR/ceph-conf --cluster=${cluster:-ceph} --name=$type.$id --lookup crush_location || :)"
-if [ -n "$location" ]; then
-    echo $location
-    exit 0
-fi
-
-# spit out something generic
-echo "host=$(hostname -s) root=default"
-