From: Dan Mick <dan.mick@inktank.com>
Date: Tue, 18 Jun 2013 18:04:15 +0000 (-0700)
Subject: ceph.in: pass parsed conffile to Rados constructor
X-Git-Tag: v0.65~41
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=81e73c7a6391ab102879e9b90a60544c2c1a7563;p=ceph.git

ceph.in: pass parsed conffile to Rados constructor

Signed-off-by: Dan Mick <dan.mick@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/ceph.in b/src/ceph.in
index 3bc73a81532b..eb62cf2b9b59 100755
--- a/src/ceph.in
+++ b/src/ceph.in
@@ -1442,7 +1442,7 @@ def main():
         clustername = parsed_args.cluster
 
     cluster_handle = rados.Rados(name=name, clustername=clustername,
-                                 conf_defaults=conf_defaults, conffile='')
+                                 conf_defaults=conf_defaults, conffile=conffile)
 
     retargs = cluster_handle.conf_parse_argv(childargs)
     #tmp = childargs