Merge pull request #40111 from tchaikov/wip-ceph-argparse-no-option-name

pybind/ceph_argparse: do not print flag name before CephChoices in he…

Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Adam King <adking@redhat.com>

src/pybind/ceph_argparse.py

@@ -830,10 +830,8 @@ def helpstr(self):
         """
         if self.t == CephBool:
             chunk = "--{0}".format(self.name.replace("_", "-"))
-        elif self.t == CephPrefix:
+        elif self.t == CephPrefix or self.t == CephChoices:
             chunk = str(self.instance)
-        elif self.t == CephChoices:
-            chunk = f'--{self.name} {{{str(self.instance)}}}'
         elif self.t == CephOsdName:
             # it just so happens all CephOsdName commands are named 'id' anyway,
             # so <id|osd.id> is perfect.