From: Sage Weil <sage@inktank.com>
Date: Mon, 19 Aug 2013 19:48:50 +0000 (-0700)
Subject: ceph: parse CEPH_ARGS environment variable
X-Git-Tag: v0.68~37
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=67a95b9880c9bc6e858150352318d68d64ed74ad;p=ceph.git

ceph: parse CEPH_ARGS environment variable

Fixes: #6052
Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Dan Mick <dan.mick@inktank.com>
---

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