diff --git a/lib/cli.py b/lib/cli.py index bbe5158b37dbcf04b1f42d06f7b3ce6db57ce2e6..3b1156c7a020f83f6276595007256466530fe631 100644 --- a/lib/cli.py +++ b/lib/cli.py @@ -47,6 +47,7 @@ __all__ = [ "CONFIRM_OPT", "DEBUG_OPT", "DEBUG_SIMERR_OPT", + "DISK_TEMPLATE_OPT", "FIELDS_OPT", "FORCE_OPT", "NOHDR_OPT", @@ -475,6 +476,12 @@ NWSYNC_OPT = cli_option("--no-wait-for-sync", dest="wait_for_sync", default=True, action="store_false", help="Don't wait for sync (DANGEROUS!)") +DISK_TEMPLATE_OPT = cli_option("-t", "--disk-template", dest="disk_template", + help="Custom disk setup (diskless, file," + " plain or drbd)", + default=None, metavar="TEMPL", + choices=list(constants.DISK_TEMPLATES)) + def _ParseArgs(argv, commands, aliases): """Parser for the command line arguments. diff --git a/scripts/gnt-backup b/scripts/gnt-backup index a45256f742db538a87ade483fd13ecb9d2a2d789..8ee9b67455131182e25f8c9542fe816f85cf37c9 100755 --- a/scripts/gnt-backup +++ b/scripts/gnt-backup @@ -218,10 +218,7 @@ import_opts = [ cli_option("-B", "--backend", dest="beparams", type="keyval", default={}, help="Backend parameters"), - cli_option("-t", "--disk-template", dest="disk_template", - help="Custom disk setup (diskless, file, plain, drbd)", - default=None, metavar="TEMPL", - choices=list(constants.DISK_TEMPLATES)), + DISK_TEMPLATE_OPT, cli_option("--disk", help="Disk information", default=[], dest="disks", action="append", diff --git a/scripts/gnt-debug b/scripts/gnt-debug index b582c5e586a639079dd72ca252a766117cda5b3d..80ea6c18863e73e052f015b41dc5229cc08abbbe 100755 --- a/scripts/gnt-debug +++ b/scripts/gnt-debug @@ -198,9 +198,7 @@ commands = { help="Memory size for the instance (MiB)"), cli_option("--disks", default="4096,4096", help="Comma separated list of disk sizes (MiB)"), - cli_option("-t", "--disk-template", default="drbd", - help="Select the disk template", - choices=list(constants.DISK_TEMPLATES)), + DISK_TEMPLATE_OPT, cli_option("--nics", default="00:11:22:33:44:55", help="Comma separated list of nics, each nic" " definition is of form mac/ip/bridge, if" diff --git a/scripts/gnt-instance b/scripts/gnt-instance index 256b39a4c11af50123d247ea687d9e2d9c0b2060..05b2a45a7b1f0759acc16218c50bf9b9f7863cd3 100755 --- a/scripts/gnt-instance +++ b/scripts/gnt-instance @@ -1375,10 +1375,7 @@ add_opts = [ cli_option("-B", "--backend", dest="beparams", type="keyval", default={}, help="Backend parameters"), - cli_option("-t", "--disk-template", dest="disk_template", - help="Custom disk setup (diskless, file, plain or drbd)", - default=None, metavar="TEMPL", - choices=list(constants.DISK_TEMPLATES)), + DISK_TEMPLATE_OPT, cli_option("-s", "--os-size", dest="sd_size", help="Disk size for a" " single-disk configuration, when not using the --disk option," " in MiB unless a suffix is used",