rgw: Added a separate section for Roles options in radosgw-admin help.

Signed-off-by: Pritha Srivastava <prsrivas@redhat.com>

diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc
index 7f7ee915ca25b0dab072bfd78c7cb58954e0370e..3b31fea8f420b919e31ebea90102443c96ff25fd 100644 (file)
--- a/src/rgw/rgw_admin.cc
+++ b/src/rgw/rgw_admin.cc
@@ -286,12 +286,6 @@ void _usage()
   cout << "                             object deletions by not involving GC\n";
   cout << "   --inconsistent-index      when specified with bucket deletion and bypass-gc set to true,\n";
   cout << "                             ignores bucket index consistency\n";
-  cout << "   --role-name               name of the role to create\n";
-  cout << "   --path                    path to the role\n";
-  cout << "   --assume-role-policy-doc  the trust relationship policy document that grants an entity permission to assume the role\n";
-  cout << "   --policy-name             name of the policy document\n";
-  cout << "   --policy-doc              permission policy document\n";
-  cout << "   --path-prefix             path prefix for filtering roles\n";
   cout << "\n";
   cout << "<date> := \"YYYY-MM-DD[ hh:mm:ss]\"\n";
   cout << "\nQuota options:\n";
@@ -307,6 +301,13 @@ void _usage()
   cout << "   --max-concurrent-ios      maximum concurrent ios for orphans find (default: 32)\n";
   cout << "\nOrphans list-jobs options:\n";
   cout << "   --extra-info              provide extra info in job list\n";
+  cout << "\nRole options:\n";
+  cout << "   --role-name               name of the role to create\n";
+  cout << "   --path                    path to the role\n";
+  cout << "   --assume-role-policy-doc  the trust relationship policy document that grants an entity permission to assume the role\n";
+  cout << "   --policy-name             name of the policy document\n";
+  cout << "   --policy-doc              permission policy document\n";
+  cout << "   --path-prefix             path prefix for filtering roles\n";
   cout << "\n";
   generic_client_usage();
 }

diff --git a/src/test/cli/radosgw-admin/help.t b/src/test/cli/radosgw-admin/help.t
index 8ec59dc920473ab89a5da4c6b48fb912a0374b1c..53b3fd3f14923976ef5bdb8567b71610e35c36fe 100644 (file)
--- a/src/test/cli/radosgw-admin/help.t
+++ b/src/test/cli/radosgw-admin/help.t
@@ -232,12 +232,6 @@
                                object deletions by not involving GC
      --inconsistent-index      when specified with bucket deletion and bypass-gc set to true,
                                ignores bucket index consistency
-     --role-name               name of the role to create
-     --path                    path to the role
-     --assume-role-policy-doc  the trust relationship policy document that grants an entity permission to assume the role
-     --policy-name             name of the policy document
-     --policy-doc              permission policy document
-     --path-prefix             path prefix for filtering roles
   
   <date> := "YYYY-MM-DD[ hh:mm:ss]"
   
@@ -257,6 +251,14 @@
   Orphans list-jobs options:
      --extra-info              provide extra info in job list
   
+  Role options:
+     --role-name               name of the role to create
+     --path                    path to the role
+     --assume-role-policy-doc  the trust relationship policy document that grants an entity permission to assume the role
+     --policy-name             name of the policy document
+     --policy-doc              permission policy document
+     --path-prefix             path prefix for filtering roles
+  
     --conf/-c FILE    read configuration from the given configuration file
     --id/-i ID        set ID portion of my name
     --name/-n TYPE.ID set name