summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSage Weil <sage@inktank.com>2013-08-19 12:48:50 -0700
committerSage Weil <sage@inktank.com>2013-08-19 12:48:58 -0700
commit67a95b9880c9bc6e858150352318d68d64ed74ad (patch)
tree0b451d85a1440a826223b7101d3054821057ff51
parenteef7cacdb19313907a9367187b742db5382ee584 (diff)
downloadceph-67a95b9880c9bc6e858150352318d68d64ed74ad.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>
-rwxr-xr-xsrc/ceph.in1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/ceph.in b/src/ceph.in
index 38464dfc2a2..ac356d80e75 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