rbd: drop --pool option from "rbd group image {add,rm}"

It stopped working with removal of get_special_pool_group_names() in
commit 3e8624f157a1 ("rbd: add support for namespaces") over six years
ago.  Given how much time has passed, stop accepting this option.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit 1f71671dc65fa9e35d451e55d8963d60f3198a93)

diff --git a/src/test/cli/rbd/help.t b/src/test/cli/rbd/help.t
index b56144204fd814190bc76a066c423aefa651d206..f288d6dcfdb7f3885ca4919d9c856ec3d2419e91 100644 (file)
--- a/src/test/cli/rbd/help.t
+++ b/src/test/cli/rbd/help.t
@@ -911,7 +911,7 @@
                              [--group-namespace <group-namespace>] 
                              [--group <group>] [--image-pool <image-pool>] 
                              [--image-namespace <image-namespace>] 
-                             [--image <image>] [--pool <pool>] 
+                             [--image <image>] 
                              <group-spec> <image-spec> 
   
   Add an image to a group.
@@ -929,7 +929,6 @@
     --image-pool arg      image pool name
     --image-namespace arg image namespace name
     --image arg           image name
-    -p [ --pool ] arg     pool name unless overridden
   
   rbd help group image list
   usage: rbd group image list [--format <format>] [--pretty-format] 
@@ -955,8 +954,7 @@
                                 [--group-namespace <group-namespace>] 
                                 [--group <group>] [--image-pool <image-pool>] 
                                 [--image-namespace <image-namespace>] 
-                                [--image <image>] [--pool <pool>] 
-                                [--image-id <image-id>] 
+                                [--image <image>] [--image-id <image-id>] 
                                 <group-spec> <image-spec> 
   
   Remove an image from a group.
@@ -974,7 +972,6 @@
     --image-pool arg      image pool name
     --image-namespace arg image namespace name
     --image arg           image name
-    -p [ --pool ] arg     pool name unless overridden
     --image-id arg        image id
   
   rbd help group list

diff --git a/src/tools/rbd/action/Group.cc b/src/tools/rbd/action/Group.cc
index b2d2e97504872237383dc799e7daa48b742bbb9a..9ea5ee47c11246e5e105e4a8763807d58f17c122 100644 (file)
--- a/src/tools/rbd/action/Group.cc
+++ b/src/tools/rbd/action/Group.cc
@@ -799,9 +799,6 @@ void get_add_arguments(po::options_description *positional,
   add_prefixed_pool_option(options, "image");
   add_prefixed_namespace_option(options, "image");
   at::add_image_option(options, at::ARGUMENT_MODIFIER_NONE);
-
-  at::add_pool_option(options, at::ARGUMENT_MODIFIER_NONE,
-              " unless overridden");
 }
 
 void get_remove_image_arguments(po::options_description *positional,
@@ -824,8 +821,6 @@ void get_remove_image_arguments(po::options_description *positional,
   add_prefixed_namespace_option(options, "image");
   at::add_image_option(options, at::ARGUMENT_MODIFIER_NONE);
 
-  at::add_pool_option(options, at::ARGUMENT_MODIFIER_NONE,
-              " unless overridden");
   at::add_image_id_option(options);
 }