import ceph quincy 17.2.1

[ceph.git] / ceph / src / ceph.in

diff --git a/ceph/src/ceph.in b/ceph/src/ceph.in
index d5023e6089ba6c70f6428f21fafa21089304e8af..1e2bf6e56d12581170a3d8e96db44a3a6cac346a 100755 (executable)
--- a/ceph/src/ceph.in
+++ b/ceph/src/ceph.in
@@ -336,7 +336,8 @@ def parse_cmdargs(args=None, target='') -> Tuple[argparse.ArgumentParser,
                         help="make less verbose")
 
     parser.add_argument('-f', '--format', choices=['json', 'json-pretty',
-                        'xml', 'xml-pretty', 'plain', 'yaml'], dest='output_format')
+                        'xml', 'xml-pretty', 'plain', 'yaml'],
+                        help="Note: yaml is only valid for orch commands", dest='output_format')
 
     parser.add_argument('--connect-timeout', dest='cluster_timeout',
                         type=int,