doc: update ceph.conf examples about btrfs default

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

2 files changed, 15 insertions, 12 deletions

diff --git a/doc/rados/configuration/demo-ceph.conf b/doc/rados/configuration/demo-ceph.conf
index ce0d87a1d48..fd5abd10403 100644
--- a/doc/rados/configuration/demo-ceph.conf
+++ b/doc/rados/configuration/demo-ceph.conf
@@ -27,12 +27,12 @@
 	# 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"
+	# utilize the following settings, and you must define the 'devs'
+	# option for each osd instance; see below.
+
+	#osd mkfs type = {fs-type}
+	#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
@@ -48,12 +48,16 @@
 
 [osd.0]
 	host = myserver01
+	#devs = {path-to-device}
 
 [osd.1]
 	host = myserver02
+	#devs = {path-to-device}
 
 [osd.2]
 	host = myserver03
+	#devs = {path-to-device}
 
 [mds.a]
 	host = myserver01
+	#devs = {path-to-device}
diff --git a/doc/start/ceph.conf b/doc/start/ceph.conf
index e6bba0938e2..22372317dcc 100644
--- a/doc/start/ceph.conf
+++ b/doc/start/ceph.conf
@@ -21,13 +21,12 @@
 	# in braces 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.
-	
-	#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"	
-
+	# utilize the following settings, and you must define the 'devs'
+	# option for each osd instance; see below.
 
+	#osd mkfs type = {fs-type}
+	#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.