diff options
| author | Tommi Virtanen <tv@inktank.com> | 2012-10-03 10:13:17 -0700 |
|---|---|---|
| committer | Tommi Virtanen <tv@inktank.com> | 2012-10-05 15:43:18 -0700 |
| commit | 4c3997dc8bbd3985a7b86d8c54b71fbe15af1591 (patch) | |
| tree | 45ffa6179b060778a6a2957c1353e37eb6de0133 /src/ceph-disk-activate | |
| parent | a6229b901785ef0a88d1b1886b5b5ae339ac7fcb (diff) | |
| download | ceph-4c3997dc8bbd3985a7b86d8c54b71fbe15af1591.tar.gz | |
ceph-disk-{prepare,activate}: Default mkfs arguments and mount options.
The values for the settings were copied from teuthology task "ceph".
Signed-off-by: Tommi Virtanen <tv@inktank.com>
Diffstat (limited to 'src/ceph-disk-activate')
| -rwxr-xr-x | src/ceph-disk-activate | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/ceph-disk-activate b/src/ceph-disk-activate index ddfadebdfeb..e3b26e15b1e 100755 --- a/src/ceph-disk-activate +++ b/src/ceph-disk-activate @@ -347,11 +347,13 @@ def get_conf(cluster, variable): MOUNT_OPTIONS = dict( - # this is default ever since linux 2.6.39 / 3.0, but we'll delay a - # moment before removing it fully because we did have some issues - # with ext4 before the xatts-in-leveldb work, and it seemed that - # user_xattr helped - ext4='user_xattr', + btrfs='noatime,user_subvol_rm_allowed', + # user_xattr is default ever since linux 2.6.39 / 3.0, but we'll + # delay a moment before removing it fully because we did have some + # issues with ext4 before the xatts-in-leveldb work, and it seemed + # that user_xattr helped + ext4='noatime,user_xattr', + xfs='noatime', ) |