From: Ken Dreyer <kdreyer@redhat.com>
Date: Tue, 15 Mar 2016 17:10:56 +0000 (-0600)
Subject: packaging: move cephfs repair tools to ceph-common
X-Git-Tag: v10.1.0~64^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5f3f37f9c073c8f94e51f23d8cd20c8213ad8b2c;p=ceph.git

packaging: move cephfs repair tools to ceph-common

The CephFS repair tools are generally useful to run on any node, not
just the MDS nodes themselves.

Move the utilities from the ceph-mds package to the ceph-common package.

Fixes: #15145
Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
---

diff --git a/ceph.spec.in b/ceph.spec.in
index 762032076fb3..83bc201efea6 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -974,6 +974,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/ceph-rbdnamer
 %{_bindir}/ceph-syn
 %{_bindir}/ceph-crush-location
+%{_bindir}/cephfs-data-scan
+%{_bindir}/cephfs-journal-tool
+%{_bindir}/cephfs-table-tool
 %{_bindir}/rados
 %{_bindir}/rbd
 %{_bindir}/rbd-replay
@@ -1050,9 +1053,6 @@ fi
 #################################################################################
 %files mds
 %{_bindir}/ceph-mds
-%{_bindir}/cephfs-journal-tool
-%{_bindir}/cephfs-table-tool
-%{_bindir}/cephfs-data-scan
 %{_mandir}/man8/ceph-mds.8*
 %if 0%{?_with_systemd}
 %{_unitdir}/ceph-mds@.service
diff --git a/debian/ceph-common.install b/debian/ceph-common.install
index 769044a2ac80..7edd8906ee7f 100644
--- a/debian/ceph-common.install
+++ b/debian/ceph-common.install
@@ -7,6 +7,9 @@ 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
 usr/bin/rados
 usr/bin/rbd
 usr/bin/rbdmap
diff --git a/debian/ceph-mds.install b/debian/ceph-mds.install
index 85bdc3bdf0ce..8a5d74e13c9c 100644
--- a/debian/ceph-mds.install
+++ b/debian/ceph-mds.install
@@ -1,5 +1,2 @@
 usr/bin/ceph-mds
-usr/bin/cephfs-journal-tool
-usr/bin/cephfs-table-tool
-usr/bin/cephfs-data-scan
 usr/share/man/man8/ceph-mds.8