config: Update sample config with more examples

Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>
Signed-off-by: Wido den Hollander <wido@widodh.nl>

diff --git a/src/sample.ceph.conf b/src/sample.ceph.conf
index 473114b3de7ecc610235ba6e96a4b27244056328..88f7f02d9926ae365ce5c2ddb5f251a425cd9508 100644 (file)
--- a/src/sample.ceph.conf
+++ b/src/sample.ceph.conf
@@ -10,6 +10,22 @@
 ; the current host (e.g., in a setup with a startup.conf on each
 ; node).
 
+; The variables $type, $id and $name are available to use in paths
+; $type = The type of daemon, possible values: mon, mds and osd
+; $id = The ID of the daemon, for mon.alpha, $id will be alpha
+; $name = $type.$id
+
+; For example:
+; osd.0
+;  $type = osd
+;  $id = 0
+;  $name = osd.0
+
+; mon.beta
+;  $type = mon
+;  $id = beta
+;  $name = mon.beta
+
 ; global
 [global]
        ; enable secure authentication
@@ -18,17 +34,36 @@
         ; allow ourselves to open a lot of files
         max open files = 131072
 
-        ; set up logging
+        ; set log file
         log file = /var/log/ceph/$name.log
+        ; log_to_syslog = true        ; uncomment this line to log to syslog
 
         ; set up pid files
         pid file = /var/run/ceph/$name.pid
 
+        ; If you want to run a IPv6 cluster, set this to true. Dual-stack isn't possible
+        ;ms bind ipv6 = true
+
 ; monitors
 ;  You need at least one.  You need at least three if you want to
 ;  tolerate any node failures.  Always create an odd number.
 [mon]
-       mon data = /data/mon$id
+        mon data = /data/$name
+
+        ; If you are using for example the RADOS Gateway and want to have your newly created
+        ; pools a higher replication level, you can set a default
+        ;osd pool default size = 3
+
+        ; You can also specify a CRUSH rule for new pools
+        ; Wiki: http://ceph.newdream.net/wiki/Custom_data_placement_with_CRUSH
+        ;osd pool default crush rule = 0
+
+        ; Timing is critical for monitors, but if you want to allow the clocks to drift a
+        ; bit more, you can specify the max drift.
+        ;mon clock drift allowed = 1
+
+        ; Tell the monitor to backoff from this warning for 30 seconds
+        ;mon clock drift warn backoff = 30
 
        ; logging, for debugging monitor crashes, in order of
        ; their likelihood of being helpful :)
@@ -37,15 +72,15 @@
        ;debug paxos = 20
        ;debug auth = 20
 
-[mon.0]
+[mon.alpha]
        host = alpha
        mon addr = 192.168.0.10:6789
 
-[mon.1]
+[mon.beta]
        host = beta
        mon addr = 192.168.0.11:6789
 
-[mon.2]
+[mon.gamma]
        host = gamma
        mon addr = 192.168.0.12:6789
 
@@ -70,18 +105,25 @@
 ;  Define as many as you like.
 [osd]
        ; This is where the btrfs volume will be mounted.
-       osd data = /data/osd$id
+       osd data = /data/$name
 
        ; Ideally, make this a separate disk or partition.  A few
        ; hundred MB should be enough; more if you have fast or many
        ; disks.  You can use a file under the osd data dir if need be
-       ; (e.g. /data/osd$id/journal), but it will be slower than a
+       ; (e.g. /data/$name/journal), but it will be slower than a
        ; separate disk or partition.
 
         ; This is an example of a file-based journal.
-       osd journal = /data/osd$id/journal
+       osd journal = /data/$name/journal
        osd journal size = 1000 ; journal size, in megabytes
 
+        ; If you want to run the journal on a tmpfs, disable DirectIO
+        ;journal dio = false
+
+        ; You can change the number of recovery operations to speed up recovery
+        ; or slow it down if your machines can't handle it
+        ; osd recovery max active = 3
+
        ; osd logging to debug osd issues, in order of likelihood of being
        ; helpful
        ;debug ms = 1
@@ -98,6 +140,10 @@
        ; usually fine for basic testing).
        btrfs devs = /dev/sdx
 
+        ; If you want to specify some other mount options, you can do so.
+        ; The default values are rw,noatime
+        ;btrfs options = rw,noatime
+
 [osd.1]
        host = epsilon
        btrfs devs = /dev/sdy