Commit 4f365444 authored by Iustin Pop's avatar Iustin Pop
Browse files

Unify the “--disk-template” option


Signed-off-by: default avatarIustin Pop <iustin@google.com>
Reviewed-by: default avatarGuido Trotter <ultrotter@google.com>
parent 3f75b4f3
......@@ -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.
......
......@@ -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",
......
......@@ -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"
......
......@@ -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",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment