doc: Added authentication and mkcephfs settings for Bobtail.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>

diff --git a/doc/start/ceph.conf b/doc/start/ceph.conf
index 1c9210bb5082bf354fe4325c1a58be5f3cbb1ed2..de854c24bdae7d8e10ed294ae6823a7af8d43c36 100644 (file)
--- a/doc/start/ceph.conf
+++ b/doc/start/ceph.conf
@@ -1,6 +1,32 @@
+[global]
+
+       # For version 0.55 and beyond, you must explicitly enable 
+       # or disable authentication with "auth" entries in [global].
+       
+       auth cluster required = cephx
+       auth service required = cephx
+       auth client required = cephx
+
 [osd]
        osd journal size = 1000
+       
+       #The following assumes ext4 filesystem.
        filestore xattr use omap = true
+               
+       # For Bobtail (v 0.56) and subsequent versions, you may 
+       # add settings for mkcephfs so that it will create and mount
+       # the file system for you. Remove the comment `#` character for 
+       # the following settings and replace the values in parenthesis 
+       # with appropriate values, or leave the following settings commented 
+       # out to accept the default values. You must specify the --mkfs 
+       # option with mkcephfs in order for the deployment script to 
+       # utilize the following settings.
+       
+       #devs = {path-to-device}
+       #osd mkfs type = {fs-type} #defaults to btrfs, if not specified
+       #osd mkfs options {fs-type} = {mkfs options} #default for xfs is "-f"
+       #osd mount options {fs-type} = {mount options} #default mount option is "rw, noatime"
+
 
        # Execute $ hostname to retrieve the name of your host,
        # and replace {hostname} with the name of your host.