diff options
| author | Sage Weil <sage@inktank.com> | 2013-08-19 12:48:50 -0700 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-08-19 12:49:52 -0700 |
| commit | 96d719eeecceaa06078a29c2f868e50e6bc9ab31 (patch) | |
| tree | 0eb28522ba55f2172786333c71e3439f575a5073 | |
| parent | d348cf5d135d099fe0490c1519196cd83a04831e (diff) | |
| download | ceph-96d719eeecceaa06078a29c2f868e50e6bc9ab31.tar.gz | |
ceph: parse CEPH_ARGS environment variable
Fixes: #6052
Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Dan Mick <dan.mick@inktank.com>
(cherry picked from commit 67a95b9880c9bc6e858150352318d68d64ed74ad)
| -rwxr-xr-x | src/ceph.in | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/ceph.in b/src/ceph.in index e4fd6eb3d65..b14842a6884 100755 --- a/src/ceph.in +++ b/src/ceph.in @@ -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 |