From: Kefu Chai <kchai@redhat.com>
Date: Tue, 23 Jun 2015 12:30:23 +0000 (+0800)
Subject: package ceph-monstore-update-crush.sh
X-Git-Tag: v9.1.0~527^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=50a33dea0a6b21950a5f95ce7645945959e9fcee;p=ceph.git

package ceph-monstore-update-crush.sh

Fixes: #11815
Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/ceph.spec.in b/ceph.spec.in
index f72e686e716cc..5968b8be2ce2f 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -969,6 +969,8 @@ ln -sf %{_libdir}/librbd.so.1 /usr/lib64/qemu/librbd.so.1
 %if (0%{?fedora} || 0%{?rhel} == 6)
 %{_bindir}/rbd-replay-prep
 %endif
+%dir %{_libdir}/ceph
+%{_libdir}/ceph/ceph-monstore-update-crush.sh
 
 #################################################################################
 %if 0%{with cephfs_java}
diff --git a/debian/ceph-test.install b/debian/ceph-test.install
index 8337b300c23a0..367cf4777ac37 100644
--- a/debian/ceph-test.install
+++ b/debian/ceph-test.install
@@ -29,3 +29,4 @@ usr/bin/ceph-kvstore-tool
 usr/share/java/libcephfs-test.jar
 usr/bin/rbd-replay*
 usr/share/man/man8/rbd-replay*.8
+usr/lib/ceph/ceph-monstore-update-crush.sh
diff --git a/src/Makefile.am b/src/Makefile.am
index daf1a8aa88f95..6bf51e229169e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -78,6 +78,7 @@ EXTRA_DIST += \
 	$(srcdir)/make_version \
 	$(srcdir)/.git_version \
 	$(srcdir)/ceph-rbdnamer \
+	$(srcdir)/tools/ceph-monstore-update-crush.sh \
 	$(srcdir)/upstart/ceph-all.conf \
 	$(srcdir)/upstart/ceph-mon.conf \
 	$(srcdir)/upstart/ceph-mon-all.conf \
diff --git a/src/tools/Makefile-server.am b/src/tools/Makefile-server.am
index f3557cda9d2d5..599c5db7011e8 100644
--- a/src/tools/Makefile-server.am
+++ b/src/tools/Makefile-server.am
@@ -11,6 +11,10 @@ ceph_kvstore_tool_LDADD = $(LIBOS) $(CEPH_GLOBAL)
 ceph_kvstore_tool_CXXFLAGS = $(UNITTEST_CXXFLAGS)
 bin_DEBUGPROGRAMS += ceph-kvstore-tool
 
+if WITH_MON
+ceph_monstore_update_crushdir = $(libdir)/ceph
+ceph_monstore_update_crush_SCRIPTS = tools/ceph-monstore-update-crush.sh
+endif
 
 if WITH_OSD