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 b14842a68848987b9feffa18a6452b1b6767a181..547a090e1371c3e6ac3e2c5ae2a4280092459eed 100755 (executable)
--- 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()