build/ops: deb: move ceph-*-tool binaries out of ceph-test subpackage

ceph-osdomap-tool into ceph-osd subpackage
ceph-monstore-tool into ceph-mon subpackage
ceph-kvstore-tool into the ceph-base subpackage

Fixes: http://tracker.ceph.com/issues/21762
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 40caf6a6d85fbde930b74df57a62381f6225c3fd)

diff --git a/debian/ceph-base.install b/debian/ceph-base.install
index 92af025a447e265c8bb866c923498d4ad00db939..65d1511d75bb3ed3dae2786a3d70cbc88242ecec 100644 (file)
--- a/debian/ceph-base.install
+++ b/debian/ceph-base.install
@@ -5,6 +5,7 @@ usr/bin/ceph-run
 usr/bin/crushtool
 usr/bin/monmaptool
 usr/bin/osdmaptool
+usr/bin/ceph-kvstore-tool
 usr/lib/ceph/ceph_common.sh
 usr/lib/ceph/erasure-code/*
 usr/lib/python*/dist-packages/ceph_detect_init*
@@ -19,3 +20,4 @@ usr/share/man/man8/ceph-run.8
 usr/share/man/man8/crushtool.8
 usr/share/man/man8/monmaptool.8
 usr/share/man/man8/osdmaptool.8
+usr/share/man/man8/ceph-kvstore-tool.8

diff --git a/debian/ceph-mon.install b/debian/ceph-mon.install
index 4fcee446efea74f229af4f51640b368f5f75ad84..edf928520011a9e49b5a222e22048bf57b152abf 100644 (file)
--- a/debian/ceph-mon.install
+++ b/debian/ceph-mon.install
@@ -1,4 +1,5 @@
 usr/bin/ceph-mon
+usr/bin/ceph-monstore-tool
 usr/bin/ceph-rest-api
 usr/lib/python*/dist-packages/ceph_rest_api.py*
 usr/share/man/man8/ceph-mon.8

diff --git a/debian/ceph-osd.install b/debian/ceph-osd.install
index 87cd5011c1ec44ee52556c3cc1f6db888516ae76..6e03f1b8df94da851a85355cd275677a3c210343 100644 (file)
--- a/debian/ceph-osd.install
+++ b/debian/ceph-osd.install
@@ -3,6 +3,7 @@ lib/udev/rules.d/95-ceph-osd.rules
 usr/bin/ceph-bluestore-tool
 usr/bin/ceph-clsinfo
 usr/bin/ceph-objectstore-tool
+usr/bin/ceph-osdomap-tool
 usr/bin/ceph-osd
 usr/bin/ceph_objectstore_bench
 usr/lib/ceph/ceph-osd-prestart.sh

diff --git a/debian/ceph-test.install b/debian/ceph-test.install
index edd4cef00a0bd44bbe9ae406ffd02d640ef86907..e712728ac21dc912f20298c330f72a7cea0725ca 100644 (file)
--- a/debian/ceph-test.install
+++ b/debian/ceph-test.install
@@ -1,8 +1,5 @@
 usr/bin/ceph-client-debug
 usr/bin/ceph-coverage
-usr/bin/ceph-kvstore-tool
-usr/bin/ceph-monstore-tool
-usr/bin/ceph-osdomap-tool
 usr/bin/ceph_bench_log
 usr/bin/ceph_erasure_code
 usr/bin/ceph_erasure_code_benchmark