Merge pull request ceph#5399 from tchaikov/wip-12458

rbd: add "--keyring" option to help message Reviewed-by: Josh Durgin <[email protected]>
shishirng · Jul 30, 2015 · 115f370 · 115f370
2 parents d621d98 + 258cb34
commit 115f370
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git 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
@@ -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