From 7ab4a3931c7976d606296c08ee8e9c93bababce1 Mon Sep 17 00:00:00 2001
From: =?utf8?q?S=C3=A9bastien=20Han?= <sebastien.han@enovance.com>
Date: Wed, 10 Dec 2014 15:32:17 +0100
Subject: [PATCH] ceph.conf: update sample
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

This commit adds:

* client admin socket
* change some default
* re-indent

Signed-off-by: Sébastien Han <sebastien.han@enovance.com>
---
 src/sample.ceph.conf | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/sample.ceph.conf b/src/sample.ceph.conf
index b2c56f54ba8f0..93c4987a19273 100644
--- a/src/sample.ceph.conf
+++ b/src/sample.ceph.conf
@@ -448,14 +448,14 @@
     # Enable caching for RADOS Block Device (RBD).
     # Type: Boolean
     # Required: No
-    # (Default: false)
-    rbd cache                  = true
+    # (Default: true)
+    rbd cache                           = true
 
     # The RBD cache size in bytes.
     # Type: 64-bit Integer
     # Required: No
     # (Default: 32 MiB)
-    ;rbd cache size            = 33554432
+    ;rbd cache size                     = 33554432
 
     # The dirty limit in bytes at which the cache triggers write-back.
     # If 0, uses write-through caching.
@@ -463,7 +463,7 @@
     # Required: No
     # Constraint: Must be less than rbd cache size.
     # (Default: 24 MiB)
-    ;rbd cache max dirty       = 25165824
+    ;rbd cache max dirty                = 25165824
 
     # The dirty target before the cache begins writing data to the data storage.
     # Does not block writes to the cache.
@@ -471,13 +471,13 @@
     # Required: No
     # Constraint: Must be less than rbd cache max dirty.
     # (Default: 16 MiB)
-    ;rbd cache target dirty    = 16777216
+    ;rbd cache target dirty             = 16777216
 
     # The number of seconds dirty data is in the cache before writeback starts.
     # Type: Float
     # Required: No
     # (Default: 1.0)
-    ;rbd cache max dirty age   = 1.0
+    ;rbd cache max dirty age            = 1.0
 
     # Start out in write-through mode, and switch to write-back after the
     # first flush request is received. Enabling this is a conservative but
@@ -485,8 +485,15 @@
     # like the virtio driver in Linux before 2.6.32.
     # Type: Boolean
     # Required: No
-    # (Default: false)
-    ;rbd cache writethrough until flush = false
+    # (Default: true)
+    ;rbd cache writethrough until flush = true
+
+    # The Ceph admin socket allows you to query a daemon via a socket interface
+    # From a client perspective this can be a virtual machine using librbd
+    # Type: String
+    # Required: No
+    ;admin socket                       = /var/run/ceph/$cluster-$type.$id.$pid.$cctid.asok
+
 
 ##################
 ## radosgw client settings
-- 
2.39.5