From beb366302a125dd422c4f092b12eb541cb3bc788 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 23 Sep 2013 09:04:34 -0700 Subject: [PATCH] Revert "ceph: parse CEPH_ARGS environment variable" 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. (cherry picked from commit 97f462be4829f0167ed3d65e6694dfc16f1f3243) --- src/ceph.in | 1 - 1 file changed, 1 deletion(-) diff --git a/src/ceph.in b/src/ceph.in index 547a090e137..35a60021752 100755 --- a/src/ceph.in +++ b/src/ceph.in @@ -558,7 +558,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 -- 2.47.3