Commit 831040bf authored by Iustin Pop's avatar Iustin Pop

Unify the “--no-lvm-storage” option

Signed-off-by: default avatarIustin Pop <iustin@google.com>
Reviewed-by: default avatarMichael Hanselmann <hansmi@google.com>
parent e7e09483
......@@ -74,6 +74,7 @@ __all__ = [
"NODE_PLACEMENT_OPT",
"NOHDR_OPT",
"NOIPCHECK_OPT",
"NOLVM_STORAGE_OPT",
"NONICS_OPT",
"NONLIVE_OPT",
"NOSTART_OPT",
......@@ -715,6 +716,11 @@ ALLOCATABLE_OPT = cli_option("--allocatable", dest="allocatable",
choices=_YESNO, default=None, metavar=_YORNO,
help="Set the allocatable flag on a volume")
NOLVM_STORAGE_OPT = cli_option("--no-lvm-storage", dest="lvm_storage",
help="Disable support for lvm based instances"
" (cluster-wide)",
action="store_false", default=True)
def _ParseArgs(argv, commands, aliases):
"""Parser for the command line arguments.
......
......@@ -612,10 +612,7 @@ commands = {
constants.DEFAULT_FILE_STORAGE_DIR,
metavar="DIR",
default=constants.DEFAULT_FILE_STORAGE_DIR,),
cli_option("--no-lvm-storage", dest="lvm_storage",
help="No support for lvm based instances"
" (cluster-wide)",
action="store_false", default=True,),
NOLVM_STORAGE_OPT,
cli_option("--no-etc-hosts", dest="modify_etc_hosts",
help="Don't modify /etc/hosts"
" (cluster-wide)",
......@@ -712,10 +709,7 @@ commands = {
" (cluster-wide) for disk allocation "
"and enable lvm based storage",
metavar="VG",),
cli_option("--no-lvm-storage", dest="lvm_storage",
help="Disable support for lvm based instances"
" (cluster-wide)",
action="store_false", default=True,),
NOLVM_STORAGE_OPT,
cli_option("--enabled-hypervisors", dest="enabled_hypervisors",
help="Comma-separated list of hypervisors",
type="string", default=None),
......
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