debian/control, ceph-disk-prepare: Depend on xfsprogs, use xfs by default.

Ext4 as a default is a bad choice, as we don't perform enough QA with
it. To use XFS as the default for ceph-disk-prepare, we need to depend
on xfsprogs.

btrfs-tools is already recommended, so no change there. If you set
osd_fs_type=btrfs, and don't have the package installed, you'll just
get an error message.

Signed-off-by: Tommi Virtanen <tv@inktank.com>

diff --git a/debian/control b/debian/control
index 6556054bdfe0f26d7c111eb787fe2fb77d80f39e..acf3db0ab4056fd55216736f9c02010101a08089 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Standards-Version: 3.9.3
 
 Package: ceph
 Architecture: linux-any
-Depends: ${shlibs:Depends}, ${misc:Depends}, sdparm | hdparm, binutils, ceph-common, uuid-runtime, python
+Depends: ${shlibs:Depends}, ${misc:Depends}, sdparm | hdparm, binutils, ceph-common, uuid-runtime, python, xfsprogs
 Recommends: ceph-mds, librados2, librbd1, btrfs-tools, gdisk
 Description: distributed storage and file system
  Ceph is a distributed storage system designed to provide excellent

diff --git a/src/ceph-disk-prepare b/src/ceph-disk-prepare
index d6ca516ed78bddc4d3d9a463a5ac18c9b57f0717..03c1527bd936a1996ec09ebbe43782d0fd74b293 100755 (executable)
--- a/src/ceph-disk-prepare
+++ b/src/ceph-disk-prepare
@@ -93,10 +93,7 @@ def get_fsid(cluster):
     return fsid
 
 
-# TODO depend on xfsprogs?
-# TODO switch default to xfs once xfsprogs is guaranteed.
-# TODO depend on btrfs-tools?
-DEFAULT_FS_TYPE = 'ext4'
+DEFAULT_FS_TYPE = 'xfs'
 
 MOUNT_OPTIONS = dict(
     btrfs='noatime,user_subvol_rm_allowed',