]> 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:48:58 +0000 (12:48 -0700)
Fixes: #6052
Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Dan Mick <dan.mick@inktank.com>
src/ceph.in

index 38464dfc2a292c639736e42df9db47a67bbbf009..ac356d80e7574310bc2ef75970b782d51c785e69 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