From: Sage Weil <sage@inktank.com>
Date: Tue, 29 Oct 2013 18:03:04 +0000 (-0700)
Subject: ceph-crush-location: new crush location hook
X-Git-Tag: v0.72-rc1~3^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fc49065d855cfd74cb861d294f3464dd616e82ee;p=ceph.git

ceph-crush-location: new crush location hook

This generalizes the bit of code that builds a key=value pair list to
update an entity's CRUSH location.

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

diff --git a/ceph.spec.in b/ceph.spec.in
index 1c65957b42d2..1cc3aee151e4 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -391,6 +391,7 @@ fi
 %{_bindir}/ceph-authtool
 %{_bindir}/ceph-syn
 %{_bindir}/ceph-post-file
+%{_bindir}/ceph-crush-location
 %{_bindir}/ceph-run
 %{_bindir}/ceph-mon
 %{_bindir}/ceph-mds
diff --git a/debian/ceph-common.install b/debian/ceph-common.install
index 41453f5a6463..8e3e48b9b82f 100644
--- a/debian/ceph-common.install
+++ b/debian/ceph-common.install
@@ -6,6 +6,7 @@ usr/bin/ceph-conf
 usr/bin/ceph-dencoder
 usr/bin/ceph-rest-api
 usr/bin/ceph-syn
+usr/bin/ceph-crush-location
 usr/bin/rados
 usr/bin/rbd
 usr/bin/ceph-post-file
diff --git a/src/Makefile.am b/src/Makefile.am
index d9189bde9cab..8d19485d6959 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -180,6 +180,7 @@ EXTRA_DIST += \
 	ceph-disk-udev \
 	ceph-create-keys \
 	ceph-rest-api \
+	ceph-crush-location \
 	mount.fuse.ceph \
 	rbdmap \
 	unittest_bufferlist.sh \
@@ -236,7 +237,8 @@ bin_SCRIPTS += \
 	ceph-clsinfo \
 	ceph-debugpack \
 	ceph-rbdnamer \
-	ceph-post-file
+	ceph-post-file \
+	ceph-crush-location
 
 BUILT_SOURCES += init-ceph
 su_sbin_SCRIPTS += mkcephfs