Commit 236fd9c4 authored by Iustin Pop's avatar Iustin Pop
Browse files

Unify the “--hypervisor” (with name) option


Signed-off-by: default avatarIustin Pop <iustin@google.com>
Reviewed-by: default avatarMichael Hanselmann <hansmi@google.com>
parent 48f212d7
......@@ -53,6 +53,7 @@ __all__ = [
"FILESTORE_DIR_OPT",
"FILESTORE_DRIVER_OPT",
"HVOPTS_OPT",
"HYPERVISOR_OPT",
"IALLOCATOR_OPT",
"FORCE_OPT",
"NOHDR_OPT",
......@@ -521,6 +522,11 @@ HVOPTS_OPT = cli_option("-H", "--hypervisor-parameters", type="keyval",
default={}, dest="hvparams",
help="Hypervisor parameters")
HYPERVISOR_OPT = cli_option("-H", "--hypervisor-parameters", dest="hypervisor",
help="Hypervisor and hypervisor options, in the"
" format hypervisor:option=value,option=value,...",
default=None, type="identkeyval")
def _ParseArgs(argv, commands, aliases):
"""Parser for the command line arguments.
......
......@@ -242,10 +242,7 @@ import_opts = [
IALLOCATOR_OPT,
FILESTORE_DIR_OPT,
FILESTORE_DRIVER_OPT,
cli_option("-H", "--hypervisor", dest="hypervisor",
help="Hypervisor and hypervisor options, in the format"
" hypervisor:option=value,option=value,...", default=None,
type="identkeyval"),
HYPERVISOR_OPT,
]
commands = {
......
......@@ -1393,10 +1393,7 @@ add_opts = [
FILESTORE_DIR_OPT,
FILESTORE_DRIVER_OPT,
IALLOCATOR_OPT,
cli_option("-H", "--hypervisor", dest="hypervisor",
help="Hypervisor and hypervisor options, in the format"
" hypervisor:option=value,option=value,...", default=None,
type="identkeyval"),
HYPERVISOR_OPT,
SUBMIT_OPT,
]
......
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