From: Benoît Knecht <benoit.knecht@fsfe.org>
Date: Mon, 23 Sep 2013 13:58:42 +0000 (+0200)
Subject: Add CEPH_ARGS at the end of sys.argv
X-Git-Tag: v0.67.4~8
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b475ff9576f145d31c053213c699e13df76d2bcb;p=ceph.git

Add CEPH_ARGS at the end of sys.argv

This allows, for instance, to pass a different client name to ceph by
exporting CEPH_ARGS="--id client_id".

Signed-off-by: Benoît Knecht <benoit.knecht@fsfe.org>
Signed-off-by: Sage Weil <sage@inktank.com>
(cherry picked from commit 30abe3244c86cbbe1f5b005850c29c9c0eafcad4)
---

diff --git a/src/ceph.in b/src/ceph.in
index b14842a6884..547a090e137 100755
--- a/src/ceph.in
+++ b/src/ceph.in
@@ -475,6 +475,9 @@ def complete(sigdict, args, target):
 ###
 
 def main():
+    ceph_args = os.environ.get('CEPH_ARGS')
+    if ceph_args:
+        sys.argv.extend(ceph_args.split())
 
     parser, parsed_args, childargs = parse_cmdargs()