doc: Modified the demo configuration file for Bobtail.

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

diff --git a/doc/rados/configuration/demo-ceph.conf b/doc/rados/configuration/demo-ceph.conf
index b96b32cd4a195d1657262204c1491f0fcd0c5dd5..ce0d87a1d489d48833103b4f8530ec4e070894c2 100644 (file)
--- a/doc/rados/configuration/demo-ceph.conf
+++ b/doc/rados/configuration/demo-ceph.conf
@@ -1,5 +1,17 @@
 [global]
-       auth supported = cephx
+       # For version 0.54 and earlier, you may enable
+       # authentication with the following setting.
+       # Specifying `cephx` enables authentication;
+       # and specifying `none` disables authentication.
+
+       #auth supported = cephx
+       
+       # 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]
@@ -7,6 +19,21 @@
        # uncomment the following line if you are mounting with ext4
        # 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"
+
 [mon.a]
        host = myserver01
        mon addr = 10.0.0.101:6789