summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Mick <dan.mick@inktank.com>2013-06-18 11:04:15 -0700
committerDan Mick <dan.mick@inktank.com>2013-06-18 14:22:40 -0700
commit81e73c7a6391ab102879e9b90a60544c2c1a7563 (patch)
tree2557d6acbcc1354e4e4a7f69101c14d265d5f3db
parent2fc8d864454f522128d39833529584de3d2a5b7a (diff)
downloadceph-81e73c7a6391ab102879e9b90a60544c2c1a7563.tar.gz
ceph.in: pass parsed conffile to Rados constructor
Signed-off-by: Dan Mick <dan.mick@inktank.com> Reviewed-by: Sage Weil <sage@inktank.com>
-rwxr-xr-xsrc/ceph.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ceph.in b/src/ceph.in
index 3bc73a81532..eb62cf2b9b5 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