packaging: mv ceph-objectstore-tool to main ceph pkg

This change ensures that the ceph-objectstore-tool utility is present on
all OSDs.  This makes it easier for users to run this tool to do manual
debugging/recovery in some scenarios.

http://tracker.ceph.com/issues/11376 Refs: #11376

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

diff --git a/ceph.spec.in b/ceph.spec.in
index 3faae3e7a5f5345bc9da6aa83b7a6c2d11546597..b2256e4ec412ec1b5e0ae7903aa57111609bbd04 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -587,6 +587,7 @@ fi
 %{_bindir}/ceph-run
 %{_bindir}/ceph-mon
 %{_bindir}/ceph-mds
+%{_bindir}/ceph-objectstore-tool
 %{_bindir}/ceph-osd
 %{_bindir}/librados-config
 %{_bindir}/ceph-client-debug
@@ -894,7 +895,6 @@ ln -sf %{_libdir}/librbd.so.1 /usr/lib64/qemu/librbd.so.1
 %{_bindir}/ceph_smalliobenchdumb
 %{_bindir}/ceph_smalliobenchfs
 %{_bindir}/ceph_smalliobenchrbd
-%{_bindir}/ceph-objectstore-tool
 %{_bindir}/ceph_streamtest
 %{_bindir}/ceph_test_*
 %{_bindir}/ceph_tpbench

diff --git a/debian/ceph-test.install b/debian/ceph-test.install
index 761728ce9fa25052535c6d1798769d02196367f3..1af1a4f1ceadea8611fa17306ee77607cab27d88 100644 (file)
--- a/debian/ceph-test.install
+++ b/debian/ceph-test.install
@@ -1,6 +1,5 @@
 usr/bin/ceph-coverage
 usr/bin/ceph_bench_log
-usr/bin/ceph-objectstore-tool
 usr/bin/ceph_kvstorebench
 usr/bin/ceph_multi_stress_watch
 usr/bin/ceph_erasure_code

diff --git a/debian/ceph.install b/debian/ceph.install
index 0cd2666a96ceab154aa65e18998c0ff7f48062dc..1aaf0a645604cc4ce130c81143d85a2aa236184f 100644 (file)
--- a/debian/ceph.install
+++ b/debian/ceph.install
@@ -8,6 +8,7 @@ usr/sbin/ceph-disk-prepare
 usr/bin/ceph-clsinfo
 usr/bin/ceph-debugpack
 usr/bin/ceph-mon
+usr/bin/ceph-objectstore-tool
 usr/bin/ceph-osd
 usr/bin/ceph-run
 usr/bin/ceph-rest-api

diff --git a/debian/control b/debian/control
index 3202f72eb06c8a223920fbbfbca7fe01a43faef6..af0125543a1e5817344aa64fd4879155b7b5c6c4 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -74,8 +74,9 @@ Depends: binutils,
          ${misc:Depends},
          ${shlibs:Depends}
 Recommends: btrfs-tools, ceph-mds, librados2, libradosstriper1, librbd1
-Replaces: ceph-common (<< 0.78-500), python-ceph (<< 0.92-1223)
-Breaks: python-ceph (<< 0.92-1223)
+Replaces: ceph-common (<< 0.78-500), python-ceph (<< 0.92-1223),
+         ceph-test (<< 0.94-1322)
+Breaks: python-ceph (<< 0.92-1223), ceph-test (<< 0.94-1322)
 X-Python-Version: >= 2.6
 Description: distributed storage and file system
  Ceph is a massively scalable, open-source, distributed