]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph: parse CEPH_ARGS environment variable
authorSage Weil <sage@inktank.com>
Mon, 19 Aug 2013 19:48:50 +0000 (12:48 -0700)
committerSage Weil <sage@inktank.com>
Mon, 19 Aug 2013 19:49:52 +0000 (12:49 -0700)
Fixes: #6052
Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Dan Mick <dan.mick@inktank.com>
(cherry picked from commit 67a95b9880c9bc6e858150352318d68d64ed74ad)

src/ceph.in

index e4fd6eb3d65301f8b7fe2edf0cc5656c9f8e8eb4..b14842a68848987b9feffa18a6452b1b6767a181 100755 (executable)
@@ -555,6 +555,7 @@ def main():
     cluster_handle = rados.Rados(name=name, clustername=clustername,
                                  conf_defaults=conf_defaults, conffile=conffile)
 
+    cluster_handle.conf_parse_env()
     retargs = cluster_handle.conf_parse_argv(childargs)
     #tmp = childargs
     childargs = retargs