Merge pull request #3984 from clumens/unnecessary-metavar

Refactor: python: Remove unnecessary metavar= settings.

Author: nrwahl2

agents/stonith/fence_legacy.in

@@ -95,20 +95,20 @@ def parse_cli_options():
     # Don't add standard help option, so we can format it how we want
     parser = argparse.ArgumentParser(add_help=False)
 
-    parser.add_argument("-t", metavar="SUBAGENT", dest="subagent",
-                        nargs=1, default="none", help="sub-agent")
+    parser.add_argument("-t", dest="subagent", nargs=1, default="none",
+                        help="sub-agent")
 
-    parser.add_argument("-n", metavar="NODE", dest="node",
-                        nargs=1, default="", help="name of target node")
+    parser.add_argument("-n", dest="node", nargs=1, default="",
+                        help="name of target node")
 
     # The help text here is consistent with the original version, though
     # perhaps all actions should be listed.
-    parser.add_argument("-o", metavar="ACTION", dest="action",
-                        nargs=1, choices=ACTIONS, default="reset",
+    parser.add_argument("-o", dest="action", nargs=1, choices=ACTIONS,
+                        default="reset",
                         help="action: on | off | reset (default) | stat | hostlist")
 
-    parser.add_argument("-s", metavar="COMMAND", dest="command",
-                        nargs=1, default="stonith", help="stonith command")
+    parser.add_argument("-s", dest="command", nargs=1, default="stonith",
+                        help="stonith command")
 
     parser.add_argument("-q", dest="quiet", action="store_true",
                         help="quiet mode")

cts/cts-cli.in

@@ -3230,7 +3230,7 @@ def build_options():
                                      description="Command line tool regression tests",
                                      epilog=f"Default tests: {' '.join(default_tests)}\n"
                                      "Other tests: agents (must be run in an installed environment)")
-    parser.add_argument("-j", "--jobs", metavar="JOBS", default=cpu_count() - 1, type=int,
+    parser.add_argument("-j", "--jobs", default=cpu_count() - 1, type=int,
                         help="The number of tests to run simultaneously")
     parser.add_argument("-p", "--path", metavar="DIR", action="append",
                         help="Look for executables in DIR (may be specified multiple times)")

python/pacemaker/_cts/environment.py

@@ -248,15 +248,13 @@ def _parse_args(self, argv):
                           help="List the valid tests")
         grp1.add_argument("--nodes",
                           default="",
-                          metavar="NODES",
                           help="List of cluster nodes separated by whitespace")
 
         grp2 = parser.add_argument_group("Options that CTS will usually auto-detect correctly")
         grp2.add_argument("-L", "--logfile",
                           metavar="PATH",
                           help="Where to look for logs from cluster nodes (or 'journal' for systemd journal)")
         grp2.add_argument("--ip", "--test-ip-base",
-                          metavar="IP",
                           help="Offset for generated IP address resources")
         grp2.add_argument("--nic",
                           default="eth0",
@@ -314,11 +312,9 @@ def _parse_args(self, argv):
                           metavar="PATH",
                           help="Location to write logs to")
         grp4.add_argument("--schema",
-                          metavar="SCHEMA",
                           default=f"pacemaker-{BuildOptions.CIB_SCHEMA_VERSION}",
                           help="Create a CIB conforming to the given schema")
         grp4.add_argument("--seed",
-                          metavar="SEED",
                           help="Use the given string as the random number seed")
         grp4.add_argument("--trunc",
                           action="store_true", dest="truncate",