From: Sage Weil <sage@inktank.com>
Date: Sat, 15 Jun 2013 00:30:02 +0000 (-0700)
Subject: ceph: pass --format=foo to old monitors
X-Git-Tag: v0.65~60
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9253cd8174ca7690414923259b01c0a484323f19;p=ceph.git

ceph: pass --format=foo to old monitors

And --threshold too, although.. really.

Signed-off-by: Sage Weil <sage@inktank.com>
Reviwed-by: Dan Mick <dan.mick@inktank.com>
---

diff --git a/src/ceph.in b/src/ceph.in
index 16155c9b3116..69608021f9b2 100755
--- a/src/ceph.in
+++ b/src/ceph.in
@@ -1577,6 +1577,10 @@ def main():
             if verbose:
                 print prefix, '{0} to old {1}'.format(' '.join(childargs), target[0])
             compat = True
+            if parsed_args.output_format:
+                childargs.extend(['--format', parsed_args.output_format])
+            if parsed_args.threshold:
+                childargs.extend(['--threshold', parsed_args.threshold])
             ret, outbuf, outs = send_command(target, childargs, inbuf)
             # combine nonerror outbuf and outs; either may have cmd output
             if ret == 0: