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 762032076fb370beb69238aea304fadbb023e0e1..83bc201efea62a6606aaf968234e9367bde3dc57 100644 (file)
--- 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 769044a2ac8077e2f9a1618d8cbffb46c049ba0c..7edd8906ee7fb61d4051ab2a8e16675b58a21b63 100644 (file)
--- 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 85bdc3bdf0ce66c4354e82fd7a982374c6ca9088..8a5d74e13c9c1110b551037d1fa1980c0daa1987 100644 (file)
--- 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