debian: move metadata server into ceph-mds

Also adjust the recommends and depends, so that libcephfs1 and ceph-fuse
hang off of ceph-mds instead of ceph.

Signed-off-by: Sage Weil <sage@inktank.com>

3 files changed, 33 insertions, 10 deletions

diff --git a/debian/ceph-mds.install b/debian/ceph-mds.install
new file mode 100644
index 00000000000..8a5d74e13c9
--- /dev/null
+++ b/debian/ceph-mds.install
@@ -0,0 +1,2 @@
+usr/bin/ceph-mds
+usr/share/man/man8/ceph-mds.8
diff --git a/debian/ceph.install b/debian/ceph.install
index 51fb31104ab..9674dbc88d6 100644
--- a/debian/ceph.install
+++ b/debian/ceph.install
@@ -4,7 +4,6 @@ usr/bin/monmaptool
 usr/bin/osdmaptool
 usr/bin/ceph-run
 usr/bin/ceph-mon
-usr/bin/ceph-mds
 usr/bin/ceph-osd
 usr/bin/ceph-debugpack
 sbin/ceph-disk-prepare usr/sbin/
@@ -15,7 +14,6 @@ usr/lib/rados-classes/*
 usr/share/doc/ceph/sample.ceph.conf
 usr/share/doc/ceph/sample.fetch_config
 usr/share/man/man8/ceph-mon.8
-usr/share/man/man8/ceph-mds.8
 usr/share/man/man8/ceph-osd.8
 usr/share/man/man8/mkcephfs.8
 usr/share/man/man8/ceph-run.8
diff --git a/debian/control b/debian/control
index 34927665a80..2db0b1bd045 100644
--- a/debian/control
+++ b/debian/control
@@ -12,13 +12,15 @@ Standards-Version: 3.9.3
 Package: ceph
 Architecture: linux-any
 Depends: ${shlibs:Depends}, ${misc:Depends}, sdparm | hdparm, binutils, ceph-common, uuid-runtime, python
-Recommends: ceph-fuse, libcephfs1, librados2, librbd1, btrfs-tools
+Recommends: ceph-mds, librados2, librbd1, btrfs-tools
 Description: distributed storage and file system
- Ceph is a distributed storage and network file system designed to provide
- excellent performance, reliability, and scalability.
+ Ceph is a distributed storage system designed to provide excellent
+ performance, reliability, and scalability.
  .
  This package contains all server daemons and management tools for creating,
- running, and administering a Ceph storage cluster.
+ running, and administering a Ceph storage cluster, with the exception of the
+ metadata server, which is necessary for using the distributed file system and is
+ provided by the ceph-mds package.
 
 Package: ceph-dbg
 Architecture: linux-any
@@ -26,16 +28,37 @@ Section: debug
 Priority: extra
 Depends: ceph (= ${binary:Version}), ${misc:Depends}
 Description: debugging symbols for ceph
+ Ceph is a distributed storage system designed to provide excellent
+ performance, reliability, and scalability.
+ .
+ This package contains the debugging symbols for ceph.
+
+Package: ceph-mds
+Architecture: linux-any
+Depends: ${shlibs:Depends}, ${misc:Depends}, ceph
+Recommends: ceph-fuse, libcephfs1, ceph-fs-common
+Description: metadata server for the ceph distributed file system
+ Ceph is a distributed storage and network file system designed to
+ provide excellent performance, reliability, and scalability.
+ .
+ This package contains the metadata server daemon, which is used to
+ create a distributed file system on top of the ceph storage cluster.
+
+Package: ceph-mds-dbg
+Architecture: linux-any
+Section: debug
+Priority: extra
+Depends: ceph-mds (= ${binary:Version}), ${misc:Depends}
+Description: debugging symbols for ceph-mds
  Ceph is a distributed storage and network file system designed to provide
  excellent performance, reliability, and scalability.
  .
- This package contains the debugging symbols for ceph.
+ This package contains the debugging symbols for ceph-mds.
 
 Package: ceph-fuse
 Architecture: linux-any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: fuse-utils
-Suggests: ceph
 Description: FUSE-based client for the Ceph distributed file system
  Ceph is a distributed network file system designed to provide
  excellent performance, reliability, and scalability.  This is a
@@ -66,7 +89,7 @@ Architecture: linux-any
 Depends: ${shlibs:Depends}, ${misc:Depends}, librbd1 (= ${binary:Version})
 Conflicts: ceph-client-tools
 Replaces: ceph-client-tools
-Suggests: ceph
+Suggests: ceph, ceph-mds
 Description: common utilities to mount and interact with a ceph storage cluster
  Ceph is a distributed storage and file system designed to provide
  excellent performance, reliability, and scalability.  This is a collection
@@ -90,7 +113,7 @@ Package: ceph-fs-common
 Architecture: linux-any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Conflicts: ceph-client-tools
-Suggests: ceph
+Suggests: ceph-mds
 Description: common utilities to mount and interact with a ceph file system
  Ceph is a distributed network file system designed to provide
  excellent performance, reliability, and scalability.  This is a collection