From: Kefu Chai <kchai@redhat.com>
Date: Wed, 4 Mar 2015 06:51:34 +0000 (+0800)
Subject: ceph.in: print help on 'osd' or 'mon'
X-Git-Tag: v9.0.0~217^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a3af64c2573ec8595c3eca6e0739b94f10cf9d55;p=ceph.git

ceph.in: print help on 'osd' or 'mon'

Fixes: #10888
Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/qa/workunits/cephtool/test.sh b/qa/workunits/cephtool/test.sh
index f47f1d8efbf3..e7a8220c3597 100755
--- a/qa/workunits/cephtool/test.sh
+++ b/qa/workunits/cephtool/test.sh
@@ -832,6 +832,8 @@ function test_mon_mds()
 
 function test_mon_mon()
 {
+  # print help message
+  ceph mon
   # no mon add/remove
   ceph mon dump
   ceph mon getmap -o $TMPDIR/monmap.$$
@@ -954,6 +956,7 @@ function test_mon_osd()
   [ "$id" = "$id2" ]
   ceph osd rm $id
 
+  ceph osd
   ceph osd ls
   ceph osd pool create data 10
   ceph osd lspools | grep data
diff --git a/src/ceph.in b/src/ceph.in
index 53f808733373..b8ca53c6e56e 100755
--- a/src/ceph.in
+++ b/src/ceph.in
@@ -666,6 +666,9 @@ def main():
         print >> sys.stderr, '"{0} tell" is deprecated; try "tell {0}.<id>" instead (id can be "*") '.format(childargs[0])
         return 1
 
+    if childargs in [['mon'], ['osd']]:
+        parsed_args.help = True
+
     if parsed_args.help:
         # short default timeout for -h
         if not timeout: