diff options
| author | Sage Weil <sage@inktank.com> | 2013-09-23 09:04:34 -0700 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-09-26 16:06:29 -0700 |
| commit | 97f462be4829f0167ed3d65e6694dfc16f1f3243 (patch) | |
| tree | 3053508058bd0bb4a9fa935eea038ff7e5604cb9 | |
| parent | 30abe3244c86cbbe1f5b005850c29c9c0eafcad4 (diff) | |
| download | ceph-97f462be4829f0167ed3d65e6694dfc16f1f3243.tar.gz | |
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.
| -rwxr-xr-x | src/ceph.in | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/ceph.in b/src/ceph.in index 07b8dc12fd2..e4d4cf10344 100755 --- a/src/ceph.in +++ b/src/ceph.in @@ -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 |