From: Kefu Chai <kchai@redhat.com>
Date: Wed, 29 Jul 2015 10:18:35 +0000 (+0800)
Subject: rbd: add "--keyring" option to help message
X-Git-Tag: v9.1.0~469^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F5399%2Fhead;p=ceph.git

rbd: add "--keyring" option to help message

Refs: #12458
Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/rbd.cc b/src/rbd.cc
index ee30e03ea14e..fbb60df15933 100644
--- a/src/rbd.cc
+++ b/src/rbd.cc
@@ -193,6 +193,7 @@ void usage()
 "  --id <username>                    rados user (without 'client.'prefix) to\n"
 "                                     authenticate as\n"
 "  --keyfile <path>                   file containing secret key for use with cephx\n"
+"  --keyring <path>                   file containing keyring for use with cephx\n"
 "  --shared <tag>                     take a shared (rather than exclusive) lock\n"
 "  --format <output-format>           output format (default: plain, json, xml)\n"
 "  --pretty-format                    make json or xml output more readable\n"
diff --git a/src/test/cli/rbd/help.t b/src/test/cli/rbd/help.t
index 182237507de9..c0a0618e6db3 100644
--- a/src/test/cli/rbd/help.t
+++ b/src/test/cli/rbd/help.t
@@ -103,6 +103,7 @@
     --id <username>                    rados user (without 'client.'prefix) to
                                        authenticate as
     --keyfile <path>                   file containing secret key for use with cephx
+    --keyring <path>                   file containing keyring for use with cephx
     --shared <tag>                     take a shared (rather than exclusive) lock
     --format <output-format>           output format (default: plain, json, xml)
     --pretty-format                    make json or xml output more readable