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>
(cherry picked from commit 61cf5da0b51e2d9578c7b4bca85184317e30f4ca)
    Conflicts:
            debian/control
            because file layout changes from ceph-test and ceph << 0.94.1-46

diff --git a/ceph.spec.in b/ceph.spec.in
index 567586cdb0b41a82ba5a02b34b5d738cf1b5b991..182ced5085dfb621c829ec7ce149baa9e7580557 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -562,6 +562,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
@@ -864,7 +865,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 f2fcd603d87dc95aa14bd545ac4bc5fc849f47c9..1ffb60e87228f358c12ba46c484c786c8c85a59a 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 4923bbc59502443182e9c11ef6eb7bb66e3e3397..42dd3c26c245d7b4a0a9a189e634866292d289e1 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 58d4cfe3ec45232bed0d4c5c5352450e55066923..0960ff38fd95f5cf019153df2c580e8b286aa30f 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -73,8 +73,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.1-46)
+Breaks: python-ceph (<< 0.92-1223), ceph-test (<< 0.94.1-46)
 X-Python-Version: >= 2.6
 Description: distributed storage and file system
  Ceph is a massively scalable, open-source, distributed