From: Sage Weil <sage@inktank.com>
Date: Fri, 27 Jul 2012 21:28:04 +0000 (-0700)
Subject: vstart.sh: apply extra conf after the defaults
X-Git-Tag: v0.51~59^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=de4474acbd7d3e2d0d4ec511680bfedb59b0a462;p=ceph.git

vstart.sh: apply extra conf after the defaults

This let's you do e.g., -o 'debug ms = 100' and it will apply after
the default logging levels.

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

diff --git a/src/vstart.sh b/src/vstart.sh
index 7ec4fc6765e7..96216953188e 100755
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -263,7 +263,6 @@ if [ "$start_mon" -eq 1 ]; then
 [global]
         osd pg bits = 3
         osd pgp bits = 5  ; (invalid, but ceph should cope!)
-$extra_conf
 EOF
 			[ "$cephx" -eq 1 ] && cat<<EOF >> $conf
         auth supported = cephx
@@ -280,6 +279,7 @@ $CMDSDEBUG
         mds debug auth pins = true
         mds debug subtrees = true
         mds data = dev/mds.\$id
+$extra_conf
 [osd]
 $DAEMONOPTS
         osd data = dev/osd\$id
@@ -290,10 +290,14 @@ $DAEMONOPTS
         osd scrub load threshold = 5.0
         filestore xattr use omap = true
 $COSDDEBUG
+$extra_conf
 [mon]
 $DAEMONOPTS
 $CMONDEBUG
+$extra_conf
         mon cluster log file = out/cluster.mon.\$id.log
+[global]
+$extra_conf
 EOF
 		fi