]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Revert "ceph: parse CEPH_ARGS environment variable" 647/head
authorSage Weil <sage@inktank.com>
Mon, 23 Sep 2013 16:04:34 +0000 (09:04 -0700)
committerSage Weil <sage@inktank.com>
Thu, 26 Sep 2013 23:06:29 +0000 (16:06 -0700)
This reverts commit 67a95b9880c9bc6e858150352318d68d64ed74ad.

We now put CEPH_ARGS in the actual args we parse in python, which are passed
to rados piecemeal later.  This lets you put things like --id ... in there
that need to be parsed before librados is initialized.

src/ceph.in

index 07b8dc12fd204296c44a0bb71be5c940666e15e8..e4d4cf10344f197ba2f0a2af9db5c60a1f33a23d 100755 (executable)
@@ -559,7 +559,6 @@ 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