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 f72e686e716ccbb228077dd7e916c56cb6422cff..5968b8be2ce2fe5c0146a6faf5f02bdcb55e3b8f 100644 (file)
--- 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 8337b300c23a0fc0b8ee2598c28782347638b0f4..367cf4777ac37eeee1947acd28a09a693f152368 100644 (file)
--- 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 daf1a8aa88f95a868be282f509a2ea0034c53b38..6bf51e229169ec8a2398fda7edfaa4c0cef91d41 100644 (file)
--- 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 f3557cda9d2d5d630b9ba6eb1ef1dd6b661686bf..599c5db7011e810befcc5cb1f02da998643f274a 100644 (file)
--- 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