doc: Updated the example configuration.

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 fd5abd10403056af4c77697265aeec49b59c1da5..ba86d531f3a2d51116adac90c0dbfd7febdf8983 100644 (file)
--- a/doc/rados/configuration/demo-ceph.conf
+++ b/doc/rados/configuration/demo-ceph.conf
@@ -1,63 +1,31 @@
 [global]
-       # 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]
-       osd journal size = 1000
-       # 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, 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
-       mon addr = 10.0.0.101:6789
-
-[mon.b]
-       host = myserver02
-       mon addr = 10.0.0.102:6789
-
-[mon.c]
-       host = myserver03
-       mon addr = 10.0.0.103:6789
-
-[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}
+fsid = {cluster-id}
+mon initial members = {hostname}[, {hostname}]
+mon host = {ip-address}[, {ip-address}]
+
+#All clusters have a front-side public network.
+#If you have two NICs, you can configure a back side cluster 
+#network for OSD object replication, heart beats, backfilling,
+#recovery, etc.
+public network = {network}[, {network}]
+#cluster network = {network}[, {network}] 
+
+#Clusters require authentication by default.
+auth cluster required = cephx
+auth service required = cephx
+auth client required = cephx
+
+#Choose reasonable numbers for your journals, number of replicas
+#and placement groups.
+osd journal size = {n}
+osd pool default size = {n}  # Write an object n times.
+osd pool default min size = {n} # Allow writing n copy in a degraded state.
+osd pool default pg num = {n}
+osd pool default pgp num = {n}
+
+#Choose a reasonable crush leaf type.
+#0 for a 1-node cluster.
+#1 for a multi node cluster in a single rack
+#2 for a multi node, multi chassis cluster with multiple hosts in a chassis
+#3 for a multi node cluster with hosts across racks, etc.
+osd crush chooseleaf type = {n}
\ No newline at end of file