_SHUTDOWN_NODES_SEC = "nodes-sec"
_SHUTDOWN_INSTANCES = "instances"
+
+_VALUE_TRUE = "true"
+
+_LIST_DEF_FIELDS = [
+ "name", "os", "pnode", "status", "oper_ram",
+ ]
+
+
def _ExpandMultiNames(mode, names):
"""Expand the given names using the passed mode.
if mode == _SHUTDOWN_CLUSTER:
if names:
raise errors.OpPrereqError("Cluster filter mode takes no arguments")
- op = opcodes.OpQueryInstances(output_fields=["name"], names=[])
- idata = SubmitOpCode(op)
+ client = GetClient()
+ idata = client.QueryInstances([], ["name"])
inames = [row[0] for row in idata]
elif mode in (_SHUTDOWN_NODES_BOTH,
_SHUTDOWN_NODES_SEC):
if not names:
raise errors.OpPrereqError("No node names passed")
- op = opcodes.OpQueryNodes(output_fields=["name", "pinst_list",
- "sinst_list"], names=names)
- ndata = SubmitOpCode(op)
+ client = GetClient()
+ ndata = client.QueryNodes(names, ["name", "pinst_list", "sinst_list"])
ipri = [row[1] for row in ndata]
pri_names = list(itertools.chain(*ipri))
isec = [row[2] for row in ndata]
elif mode == _SHUTDOWN_INSTANCES:
if not names:
raise errors.OpPrereqError("No instance names passed")
- op = opcodes.OpQueryInstances(output_fields=["name"], names=names)
- idata = SubmitOpCode(op)
+ client = GetClient()
+ idata = client.QueryInstances(names, ["name"])
inames = [row[0] for row in idata]
else:
choice = AskUser(ask, choices)
if choice == 'v':
choices.pop(1)
- choice = AskUser(choices, msg + affected)
+ choice = AskUser(msg + affected, choices)
return choice
+def _TransformPath(user_input):
+ """Transform a user path into a canonical value.
+
+ This function transforms the a path passed as textual information
+ into the constants that the LU code expects.
+
+ """
+ if user_input:
+ if user_input.lower() == "default":
+ result_path = constants.VALUE_DEFAULT
+ elif user_input.lower() == "none":
+ result_path = constants.VALUE_NONE
+ else:
+ if not os.path.isabs(user_input):
+ raise errors.OpPrereqError("Path '%s' is not an absolute filename" %
+ user_input)
+ result_path = user_input
+ else:
+ result_path = constants.VALUE_DEFAULT
+
+ return result_path
+
+
def ListInstances(opts, args):
"""List instances and their properties.
"""
if opts.output is None:
- selected_fields = ["name", "os", "pnode", "admin_state",
- "oper_state", "oper_ram"]
+ selected_fields = _LIST_DEF_FIELDS
+ elif opts.output.startswith("+"):
+ selected_fields = _LIST_DEF_FIELDS + opts.output[1:].split(",")
else:
selected_fields = opts.output.split(",")
- op = opcodes.OpQueryInstances(output_fields=selected_fields, names=[])
- output = SubmitOpCode(op)
+ output = GetClient().QueryInstances([], selected_fields)
if not opts.no_headers:
- headers = {"name": "Instance", "os": "OS", "pnode": "Primary_node",
- "snodes": "Secondary_Nodes", "admin_state": "Autostart",
- "oper_state": "Status", "admin_ram": "Configured_memory",
- "oper_ram": "Memory", "disk_template": "Disk_template",
- "ip": "IP Address", "mac": "MAC Address",
- "bridge": "Bridge",
- "sda_size": "Disk/0", "sdb_size": "Disk/1"}
+ headers = {
+ "name": "Instance", "os": "OS", "pnode": "Primary_node",
+ "snodes": "Secondary_Nodes", "admin_state": "Autostart",
+ "oper_state": "Running", "admin_ram": "Configured_memory",
+ "oper_ram": "Memory", "disk_template": "Disk_template",
+ "ip": "IP_address", "mac": "MAC_address",
+ "bridge": "Bridge", "vcpus": "VCPUs",
+ "sda_size": "Disk/0", "sdb_size": "Disk/1",
+ "status": "Status", "tags": "Tags",
+ "network_port": "Network_port",
+ "kernel_path": "Kernel_path",
+ "initrd_path": "Initrd_path",
+ "hvm_boot_order": "HVM_boot_order",
+ "hvm_acpi": "HVM_ACPI",
+ "hvm_pae": "HVM_PAE",
+ "hvm_cdrom_image_path": "HVM_CDROM_image_path",
+ "hvm_nic_type": "HVM_NIC_type",
+ "hvm_disk_type": "HVM_disk_type",
+ "vnc_bind_address": "VNC_bind_address",
+ }
else:
headers = None
else:
unitfields = None
- numfields = ["admin_ram", "oper_ram", "sda_size", "sdb_size"]
+ numfields = ["admin_ram", "oper_ram", "sda_size", "sdb_size", "vcpus"]
+ list_type_fields = ("tags",)
# change raw values to nicer strings
for row in output:
for idx, field in enumerate(selected_fields):
elif field == "sda_size" or field == "sdb_size":
if val is None:
val = "N/A"
+ elif field in list_type_fields:
+ val = ",".join(val)
row[idx] = str(val)
data = GenerateTable(separator=opts.separator, headers=headers,
"""
instance = args[0]
+ (pnode, snode) = SplitNodeOption(opts.node)
+
+ kernel_path = _TransformPath(opts.kernel_path)
+ initrd_path = _TransformPath(opts.initrd_path)
+
+ hvm_acpi = opts.hvm_acpi == _VALUE_TRUE
+ hvm_pae = opts.hvm_pae == _VALUE_TRUE
+
+ if ((opts.hvm_cdrom_image_path is not None) and
+ (opts.hvm_cdrom_image_path.lower() == constants.VALUE_NONE)):
+ hvm_cdrom_image_path = None
+ else:
+ hvm_cdrom_image_path = opts.hvm_cdrom_image_path
+
op = opcodes.OpCreateInstance(instance_name=instance, mem_size=opts.mem,
disk_size=opts.size, swap_size=opts.swap,
disk_template=opts.disk_template,
mode=constants.INSTANCE_CREATE,
- os_type=opts.os, pnode=opts.node,
- snode=opts.snode, vcpus=opts.vcpus,
+ os_type=opts.os, pnode=pnode,
+ snode=snode, vcpus=opts.vcpus,
ip=opts.ip, bridge=opts.bridge,
start=opts.start, ip_check=opts.ip_check,
- wait_for_sync=opts.wait_for_sync)
- SubmitOpCode(op)
+ wait_for_sync=opts.wait_for_sync,
+ mac=opts.mac,
+ kernel_path=kernel_path,
+ initrd_path=initrd_path,
+ iallocator=opts.iallocator,
+ hvm_boot_order=opts.hvm_boot_order,
+ file_storage_dir=opts.file_storage_dir,
+ file_driver=opts.file_driver,
+ hvm_acpi=hvm_acpi, hvm_pae=hvm_pae,
+ hvm_cdrom_image_path=hvm_cdrom_image_path,
+ vnc_bind_address=opts.vnc_bind_address,
+ hvm_nic_type=opts.hvm_nic_type,
+ hvm_disk_type=opts.hvm_disk_type)
+
+ SubmitOrSend(op, opts)
return 0
"""
instance_name = args[0]
+ if opts.select_os is True:
+ op = opcodes.OpDiagnoseOS(output_fields=["name", "valid"], names=[])
+ result = SubmitOpCode(op)
+
+ if not result:
+ logger.ToStdout("Can't get the OS list")
+ return 1
+
+ logger.ToStdout("Available OS templates:")
+ number = 0
+ choices = []
+ for entry in result:
+ logger.ToStdout("%3s: %s" % (number, entry[0]))
+ choices.append(("%s" % number, entry[0], entry[0]))
+ number = number + 1
+
+ choices.append(('x', 'exit', 'Exit gnt-instance reinstall'))
+ selected = AskUser("Enter OS template name or number (or x to abort):",
+ choices)
+
+ if selected == 'exit':
+ logger.ToStdout("User aborted reinstall, exiting")
+ return 1
+
+ os = selected
+ else:
+ os = opts.os
+
if not opts.force:
- usertext = ("This will reinstall the instance %s and remove "
- "all data. Continue?") % instance_name
+ usertext = ("This will reinstall the instance %s and remove"
+ " all data. Continue?") % instance_name
if not AskUser(usertext):
return 1
op = opcodes.OpReinstallInstance(instance_name=instance_name,
- os_type=opts.os)
- SubmitOpCode(op)
+ os_type=os)
+ SubmitOrSend(op, opts)
return 0
op = opcodes.OpRemoveInstance(instance_name=instance_name,
ignore_failures=opts.ignore_failures)
- SubmitOpCode(op)
+ SubmitOrSend(op, opts)
return 0
op = opcodes.OpRenameInstance(instance_name=args[0],
new_name=args[1],
ignore_ip=opts.ignore_ip)
- SubmitOpCode(op)
-
+ SubmitOrSend(op, opts)
return 0
"""
instance_name = args[0]
op = opcodes.OpActivateInstanceDisks(instance_name=instance_name)
- disks_info = SubmitOpCode(op)
+ disks_info = SubmitOrSend(op, opts)
for host, iname, nname in disks_info:
print "%s:%s:%s" % (host, iname, nname)
return 0
"""
instance_name = args[0]
op = opcodes.OpDeactivateInstanceDisks(instance_name=instance_name)
- SubmitOpCode(op)
+ SubmitOrSend(op, opts)
+ return 0
+
+
+def GrowDisk(opts, args):
+ """Command-line interface for _ShutdownInstanceBlockDevices.
+
+ This function takes the instance name, looks for its primary node
+ and the tries to shutdown its block devices on that node.
+
+ """
+ instance = args[0]
+ disk = args[1]
+ amount = utils.ParseUnit(args[2])
+ op = opcodes.OpGrowDisk(instance_name=instance, disk=disk, amount=amount)
+ SubmitOrSend(op, opts)
return 0
if opts.multi_mode is None:
opts.multi_mode = _SHUTDOWN_INSTANCES
inames = _ExpandMultiNames(opts.multi_mode, args)
+ if not inames:
+ raise errors.OpPrereqError("Selection filter does not match any instances")
multi_on = opts.multi_mode != _SHUTDOWN_INSTANCES or len(inames) > 1
if not (opts.force_multi or not multi_on
or _ConfirmOperation(inames, "startup")):
extra_args=opts.extra_args)
if multi_on:
logger.ToStdout("Starting up %s" % name)
- SubmitOpCode(op)
+ try:
+ SubmitOrSend(op, opts)
+ except JobSubmittedException, err:
+ _, txt = FormatError(err)
+ logger.ToStdout("%s" % txt)
return 0
+
def RebootInstance(opts, args):
"""Reboot an instance
if opts.multi_mode is None:
opts.multi_mode = _SHUTDOWN_INSTANCES
inames = _ExpandMultiNames(opts.multi_mode, args)
+ if not inames:
+ raise errors.OpPrereqError("Selection filter does not match any instances")
multi_on = opts.multi_mode != _SHUTDOWN_INSTANCES or len(inames) > 1
if not (opts.force_multi or not multi_on
or _ConfirmOperation(inames, "reboot")):
reboot_type=opts.reboot_type,
ignore_secondaries=opts.ignore_secondaries)
- SubmitOpCode(op)
+ SubmitOrSend(op, opts)
return 0
+
def ShutdownInstance(opts, args):
"""Shutdown an instance.
if opts.multi_mode is None:
opts.multi_mode = _SHUTDOWN_INSTANCES
inames = _ExpandMultiNames(opts.multi_mode, args)
+ if not inames:
+ raise errors.OpPrereqError("Selection filter does not match any instances")
multi_on = opts.multi_mode != _SHUTDOWN_INSTANCES or len(inames) > 1
if not (opts.force_multi or not multi_on
or _ConfirmOperation(inames, "shutdown")):
op = opcodes.OpShutdownInstance(instance_name=name)
if multi_on:
logger.ToStdout("Shutting down %s" % name)
- SubmitOpCode(op)
- return 0
-
-
-def AddMDDRBDComponent(opts, args):
- """Add a new component to a remote_raid1 disk.
-
- Args:
- opts - class with options as members
- args - list with a single element, the instance name
-
- """
- op = opcodes.OpAddMDDRBDComponent(instance_name=args[0],
- disk_name=opts.disk,
- remote_node=opts.node)
- SubmitOpCode(op)
- return 0
-
-
-def RemoveMDDRBDComponent(opts, args):
- """Remove a component from a remote_raid1 disk.
-
- Args:
- opts - class with options as members
- args - list with a single element, the instance name
-
- """
- op = opcodes.OpRemoveMDDRBDComponent(instance_name=args[0],
- disk_name=opts.disk,
- disk_id=opts.port)
- SubmitOpCode(op)
+ try:
+ SubmitOrSend(op, opts)
+ except JobSubmittedException, err:
+ _, txt = FormatError(err)
+ logger.ToStdout("%s" % txt)
return 0
"""
instance_name = args[0]
- new_secondary = opts.new_secondary
- op = opcodes.OpReplaceDisks(instance_name=args[0],
- remote_node=opts.new_secondary)
- SubmitOpCode(op)
+ new_2ndary = opts.new_secondary
+ iallocator = opts.iallocator
+ if opts.disks is None:
+ disks = ["sda", "sdb"]
+ else:
+ disks = opts.disks.split(",")
+ if opts.on_primary == opts.on_secondary: # no -p or -s passed, or both passed
+ mode = constants.REPLACE_DISK_ALL
+ elif opts.on_primary: # only on primary:
+ mode = constants.REPLACE_DISK_PRI
+ if new_2ndary is not None or iallocator is not None:
+ raise errors.OpPrereqError("Can't change secondary node on primary disk"
+ " replacement")
+ elif opts.on_secondary is not None or iallocator is not None:
+ # only on secondary
+ mode = constants.REPLACE_DISK_SEC
+
+ op = opcodes.OpReplaceDisks(instance_name=args[0], disks=disks,
+ remote_node=new_2ndary, mode=mode,
+ iallocator=iallocator)
+ SubmitOrSend(op, opts)
return 0
op = opcodes.OpFailoverInstance(instance_name=instance_name,
ignore_consistency=opts.ignore_consistency)
- SubmitOpCode(op)
+ SubmitOrSend(op, opts)
return 0
instance_name = args[0]
op = opcodes.OpConnectConsole(instance_name=instance_name)
- cmd, argv = SubmitOpCode(op)
- # drop lock and exec so other commands can run while we have console
- utils.Unlock("cmd")
- try:
- os.execvp(cmd, argv)
- finally:
- sys.stderr.write("Can't run console command %s with arguments:\n'%s'" %
- (cmd, " ".join(argv)))
- os._exit(1)
+ cmd = SubmitOpCode(op)
+
+ if opts.show_command:
+ print utils.ShellQuoteArgs(cmd)
+ else:
+ try:
+ os.execvp(cmd[0], cmd)
+ finally:
+ sys.stderr.write("Can't run console command %s with arguments:\n'%s'" %
+ (cmd, " ".join(argv)))
+ os._exit(1)
def _FormatBlockDevInfo(buf, dev, indent_level):
"""
def helper(buf, dtype, status):
- """Format one line for phsyical device status."""
+ """Format one line for physical device status."""
if not status:
buf.write("not active\n")
else:
- (path, major, minor, syncp, estt, degr) = status
- buf.write("%s (%d:%d)" % (path, major, minor))
- if dtype in (constants.LD_MD_R1, constants.LD_DRBD7):
+ (path, major, minor, syncp, estt, degr, ldisk) = status
+ if major is None:
+ major_string = "N/A"
+ else:
+ major_string = str(major)
+
+ if minor is None:
+ minor_string = "N/A"
+ else:
+ minor_string = str(minor)
+
+ buf.write("%s (%s:%s)" % (path, major_string, minor_string))
+ if dtype in (constants.LD_DRBD8, ):
if syncp is not None:
sync_text = "*RECOVERING* %5.2f%%," % syncp
if estt:
degr_text = "*DEGRADED*"
else:
degr_text = "ok"
- buf.write(" %s, status %s" % (sync_text, degr_text))
+ if ldisk:
+ ldisk_text = " *MISSING DISK*"
+ else:
+ ldisk_text = ""
+ buf.write(" %s, status %s%s" % (sync_text, degr_text, ldisk_text))
+ elif dtype == constants.LD_LV:
+ if ldisk:
+ ldisk_text = " *FAILED* (failed drive?)"
+ else:
+ ldisk_text = ""
+ buf.write(ldisk_text)
buf.write("\n")
if dev["iv_name"] is not None:
retcode = 0
op = opcodes.OpQueryInstanceData(instances=args)
result = SubmitOpCode(op)
+ hvm_parameters = ("hvm_acpi", "hvm_pae", "hvm_cdrom_image_path",
+ "hvm_boot_order", "hvm_nic_type", "hvm_disk_type")
+
+ pvm_parameters = ("kernel_path", "initrd_path")
if not result:
logger.ToStdout("No instances.")
buf.write(" - primary: %s\n" % instance["pnode"])
buf.write(" - secondaries: %s\n" % ", ".join(instance["snodes"]))
buf.write(" Operating system: %s\n" % instance["os"])
+ if instance.has_key("network_port"):
+ buf.write(" Allocated network port: %s\n" % instance["network_port"])
+ if False not in map(instance.has_key, pvm_parameters):
+ if instance["kernel_path"] in (None, constants.VALUE_DEFAULT):
+ kpath = "(default: %s)" % constants.XEN_KERNEL
+ else:
+ kpath = instance["kernel_path"]
+ buf.write(" Kernel path: %s\n" % kpath)
+ if instance["initrd_path"] in (None, constants.VALUE_DEFAULT):
+ initrd = "(default: %s)" % constants.XEN_INITRD
+ elif instance["initrd_path"] == constants.VALUE_NONE:
+ initrd = "(none)"
+ else:
+ initrd = instance["initrd_path"]
+ buf.write(" initrd: %s\n" % initrd)
+ if False not in map(instance.has_key, hvm_parameters):
+ buf.write(" HVM:\n")
+ buf.write(" - boot order: %s\n" % instance["hvm_boot_order"])
+ buf.write(" - ACPI support: %s\n" % instance["hvm_acpi"])
+ buf.write(" - PAE support: %s\n" % instance["hvm_pae"])
+ buf.write(" - virtual CDROM: %s\n" % instance["hvm_cdrom_image_path"])
+ buf.write(" - virtual NIC type: %s\n" % instance["hvm_nic_type"])
+ buf.write(" - virtual disk type: %s\n" % instance["hvm_disk_type"])
+ if instance.has_key("vnc_bind_address"):
+ buf.write(" VNC bind address: %s\n" % instance["vnc_bind_address"])
+ buf.write(" VNC console port: %s\n" % instance["vnc_console_port"])
buf.write(" Hardware:\n")
buf.write(" - VCPUs: %d\n" % instance["vcpus"])
buf.write(" - memory: %dMiB\n" % instance["memory"])
return retcode
-def SetInstanceParms(opts, args):
+def SetInstanceParams(opts, args):
"""Modifies an instance.
All parameters take effect only at the next restart of the instance.
Opts used:
memory - the new memory size
vcpus - the new number of cpus
+ mac - the new MAC address of the instance
"""
- if not opts.mem and not opts.vcpus and not opts.ip and not opts.bridge:
+ if not (opts.mem or opts.vcpus or opts.ip or opts.bridge or opts.mac or
+ opts.kernel_path or opts.initrd_path or opts.hvm_boot_order or
+ opts.hvm_acpi or opts.hvm_pae or opts.hvm_cdrom_image_path or
+ opts.vnc_bind_address or opts.hvm_nic_type or opts.hvm_disk_type):
logger.ToStdout("Please give at least one of the parameters.")
return 1
- op = opcodes.OpSetInstanceParms(instance_name=args[0], mem=opts.mem,
- vcpus=opts.vcpus, ip=opts.ip,
- bridge=opts.bridge)
- result = SubmitOpCode(op)
+ kernel_path = _TransformPath(opts.kernel_path)
+ initrd_path = _TransformPath(opts.initrd_path)
+ if opts.hvm_boot_order == 'default':
+ hvm_boot_order = constants.VALUE_DEFAULT
+ else:
+ hvm_boot_order = opts.hvm_boot_order
+
+ if opts.hvm_acpi is None:
+ hvm_acpi = opts.hvm_acpi
+ else:
+ hvm_acpi = opts.hvm_acpi == _VALUE_TRUE
+
+ if opts.hvm_pae is None:
+ hvm_pae = opts.hvm_pae
+ else:
+ hvm_pae = opts.hvm_pae == _VALUE_TRUE
+
+ if opts.hvm_nic_type == constants.VALUE_NONE:
+ hvm_nic_type = None
+ else:
+ hvm_nic_type = opts.hvm_nic_type
+
+ if opts.hvm_disk_type == constants.VALUE_NONE:
+ hvm_disk_type = None
+ else:
+ hvm_disk_type = opts.hvm_disk_type
+
+ op = opcodes.OpSetInstanceParams(instance_name=args[0], mem=opts.mem,
+ vcpus=opts.vcpus, ip=opts.ip,
+ bridge=opts.bridge, mac=opts.mac,
+ kernel_path=opts.kernel_path,
+ initrd_path=opts.initrd_path,
+ hvm_boot_order=hvm_boot_order,
+ hvm_acpi=hvm_acpi, hvm_pae=hvm_pae,
+ hvm_cdrom_image_path=
+ opts.hvm_cdrom_image_path,
+ vnc_bind_address=opts.vnc_bind_address,
+ hvm_nic_type=hvm_nic_type,
+ hvm_disk_type=hvm_disk_type,
+ force=opts.force)
+
+ # even if here we process the result, we allow submit only
+ result = SubmitOrSend(op, opts)
if result:
logger.ToStdout("Modified instance %s" % args[0])
# this is defined separately due to readability only
add_opts = [
DEBUG_OPT,
- node_opt,
+ make_option("-n", "--node", dest="node",
+ help="Target node and optional secondary node",
+ metavar="<pnode>[:<snode>]"),
cli_option("-s", "--os-size", dest="size", help="Disk size, in MiB unless"
" a suffix is used",
default=20 * 1024, type="unit", metavar="<size>"),
make_option("-p", "--cpu", dest="vcpus", help="Number of virtual CPUs",
default=1, type="int", metavar="<PROC>"),
make_option("-t", "--disk-template", dest="disk_template",
- help="Custom disk setup (diskless, plain, local_raid1 or"
- " remote_raid1)", default=None, metavar="TEMPL"),
+ help="Custom disk setup (diskless, file, plain or drbd)",
+ default=None, metavar="TEMPL"),
make_option("-i", "--ip", dest="ip",
help="IP address ('none' [default], 'auto', or specify address)",
default='none', type="string", metavar="<ADDRESS>"),
+ make_option("--mac", dest="mac",
+ help="MAC address ('auto' [default], or specify address)",
+ default='auto', type="string", metavar="<MACADDRESS>"),
make_option("--no-wait-for-sync", dest="wait_for_sync", default=True,
action="store_false", help="Don't wait for sync (DANGEROUS!)"),
- make_option("--secondary-node", dest="snode",
- help="Secondary node for remote_raid1 disk layout",
- metavar="<node>"),
make_option("-b", "--bridge", dest="bridge",
help="Bridge to connect this instance to",
default=None, metavar="<bridge>"),
make_option("--no-ip-check", dest="ip_check", default=True,
action="store_false", help="Don't check that the instance's IP"
" is alive (only valid with --no-start)"),
+ make_option("--kernel", dest="kernel_path",
+ help="Path to the instances' kernel (or 'default')",
+ default=None,
+ type="string", metavar="<FILENAME>"),
+ make_option("--initrd", dest="initrd_path",
+ help="Path to the instances' initrd (or 'none', or 'default')",
+ default=None,
+ type="string", metavar="<FILENAME>"),
+ make_option("--hvm-boot-order", dest="hvm_boot_order",
+ help="Boot device order for HVM (one or more of [acdn])",
+ default=None, type="string", metavar="<BOOTORDER>"),
+ make_option("--file-storage-dir", dest="file_storage_dir",
+ help="Relative path under default cluster-wide file storage dir"
+ " to store file-based disks", default=None,
+ metavar="<DIR>"),
+ make_option("--file-driver", dest="file_driver", help="Driver to use"
+ " for image files", default="loop", metavar="<DRIVER>"),
+ make_option("--iallocator", metavar="<NAME>",
+ help="Select nodes for the instance automatically using the"
+ " <NAME> iallocator plugin", default=None, type="string"),
+ make_option("--hvm-acpi", dest="hvm_acpi",
+ help="ACPI support for HVM (true|false)",
+ metavar="<BOOL>", choices=["true", "false"]),
+ make_option("--hvm-nic-type", dest="hvm_nic_type",
+ help="Type of virtual NIC for HVM "
+ "(rtl8139,ne2k_pci,ne2k_isa,paravirtual)",
+ metavar="NICTYPE", choices=[constants.HT_HVM_NIC_RTL8139,
+ constants.HT_HVM_NIC_NE2K_PCI,
+ constants.HT_HVM_NIC_NE2K_ISA,
+ constants.HT_HVM_DEV_PARAVIRTUAL],
+ default=constants.HT_HVM_NIC_RTL8139),
+ make_option("--hvm-disk-type", dest="hvm_disk_type",
+ help="Type of virtual disks for HVM (ioemu,paravirtual)",
+ metavar="DISKTYPE", choices=[constants.HT_HVM_DEV_IOEMU,
+ constants.HT_HVM_DEV_PARAVIRTUAL],
+ default=constants.HT_HVM_DEV_IOEMU,),
+ make_option("--hvm-pae", dest="hvm_pae",
+ help="PAE support for HVM (true|false)",
+ metavar="<BOOL>", choices=["true", "false"]),
+ make_option("--hvm-cdrom-image-path", dest="hvm_cdrom_image_path",
+ help="CDROM image path for HVM (absolute path or None)",
+ default=None, type="string", metavar="<CDROMIMAGE>"),
+ make_option("--vnc-bind-address", dest="vnc_bind_address",
+ help="bind address for VNC (IP address)",
+ default=None, type="string", metavar="<VNCADDRESS>"),
+ SUBMIT_OPT,
]
commands = {
'add': (AddInstance, ARGS_ONE, add_opts,
- "[opts...] <name>",
+ "[...] -t disk-type -n node[:secondary-node] -o os-type <name>",
"Creates and adds a new instance to the cluster"),
- 'add-mirror': (AddMDDRBDComponent, ARGS_ONE,
- [DEBUG_OPT, node_opt,
- make_option("-b", "--disk", dest="disk", metavar="sdX",
- help=("The name of the instance disk for which to"
- " add the mirror"))],
- "-n node -b disk <instance>",
- "Creates a new mirror for the instance"),
- 'console': (ConnectToInstanceConsole, ARGS_ONE, [DEBUG_OPT],
- "<instance>",
+ 'console': (ConnectToInstanceConsole, ARGS_ONE,
+ [DEBUG_OPT,
+ make_option("--show-cmd", dest="show_command",
+ action="store_true", default=False,
+ help=("Show command instead of executing it"))],
+ "[--show-cmd] <instance>",
"Opens a console on the specified instance"),
'failover': (FailoverInstance, ARGS_ONE,
[DEBUG_OPT, FORCE_OPT,
action="store_true", default=False,
help="Ignore the consistency of the disks on"
" the secondary"),
+ SUBMIT_OPT,
],
"[-f] <instance>",
"Stops the instance and starts it on the backup node, using"
- " the remote mirror (only for instances of type remote_raid1)"),
+ " the remote mirror (only for instances of type drbd)"),
'info': (ShowInstanceConfig, ARGS_ANY, [DEBUG_OPT], "[<instance>...]",
"Show information on the specified instance"),
'list': (ListInstances, ARGS_NONE,
- [DEBUG_OPT, NOHDR_OPT, SEP_OPT, USEUNITS_OPT, FIELDS_OPT],
- "", "Lists the instances and their status"),
- 'reinstall': (ReinstallInstance, ARGS_ONE, [DEBUG_OPT, FORCE_OPT, os_opt],
- "[-f] <instance>", "Reinstall the instance"),
+ [DEBUG_OPT, NOHDR_OPT, SEP_OPT, USEUNITS_OPT, FIELDS_OPT], "",
+ "Lists the instances and their status. The available fields are"
+ " (see the man page for details): status, oper_state, oper_ram,"
+ " name, os, pnode, snodes, admin_state, admin_ram, disk_template,"
+ " ip, mac, bridge, sda_size, sdb_size, vcpus. The default field"
+ " list is (in order): %s." % ", ".join(_LIST_DEF_FIELDS),
+ ),
+ 'reinstall': (ReinstallInstance, ARGS_ONE,
+ [DEBUG_OPT, FORCE_OPT, os_opt,
+ make_option("--select-os", dest="select_os",
+ action="store_true", default=False,
+ help="Interactive OS reinstall, lists available"
+ " OS templates for selection"),
+ SUBMIT_OPT,
+ ],
+ "[-f] <instance>", "Reinstall a stopped instance"),
'remove': (RemoveInstance, ARGS_ONE,
[DEBUG_OPT, FORCE_OPT,
make_option("--ignore-failures", dest="ignore_failures",
help=("Remove the instance from the cluster even"
" if there are failures during the removal"
" process (shutdown, disk removal, etc.)")),
+ SUBMIT_OPT,
],
"[-f] <instance>", "Shuts down the instance and removes it"),
- 'remove-mirror': (RemoveMDDRBDComponent, ARGS_ONE,
- [DEBUG_OPT, node_opt,
- make_option("-b", "--disk", dest="disk", metavar="sdX",
- help=("The name of the instance disk"
- " for which to add the mirror")),
- make_option("-p", "--port", dest="port", metavar="PORT",
- help=("The port of the drbd device"
- " which to remove from the mirror"),
- type="int"),
- ],
- "-b disk -p port <instance>",
- "Removes a mirror from the instance"),
'rename': (RenameInstance, ARGS_FIXED(2),
[DEBUG_OPT,
make_option("--no-ip-check", dest="ignore_ip",
help="Do not check that the IP of the new name"
" is alive",
default=False, action="store_true"),
+ SUBMIT_OPT,
],
"<instance> <new_name>", "Rename the instance"),
'replace-disks': (ReplaceDisks, ARGS_ONE,
[DEBUG_OPT,
make_option("-n", "--new-secondary", dest="new_secondary",
- metavar="NODE",
- help=("New secondary node (if you want to"
- " change the secondary)"))],
- "[-n NODE] <instance>",
+ help=("New secondary node (for secondary"
+ " node change)"), metavar="NODE"),
+ make_option("-p", "--on-primary", dest="on_primary",
+ default=False, action="store_true",
+ help=("Replace the disk(s) on the primary"
+ " node (only for the drbd template)")),
+ make_option("-s", "--on-secondary", dest="on_secondary",
+ default=False, action="store_true",
+ help=("Replace the disk(s) on the secondary"
+ " node (only for the drbd template)")),
+ make_option("--disks", dest="disks", default=None,
+ help=("Comma-separated list of disks"
+ " to replace (e.g. sda) (optional,"
+ " defaults to all disks")),
+ make_option("--iallocator", metavar="<NAME>",
+ help="Select new secondary for the instance"
+ " automatically using the"
+ " <NAME> iallocator plugin (enables"
+ " secondary node replacement)",
+ default=None, type="string"),
+ SUBMIT_OPT,
+ ],
+ "[-s|-p|-n NODE] <instance>",
"Replaces all disks for the instance"),
- 'modify': (SetInstanceParms, ARGS_ONE,
+ 'modify': (SetInstanceParams, ARGS_ONE,
[DEBUG_OPT, FORCE_OPT,
cli_option("-m", "--memory", dest="mem",
help="Memory size",
make_option("-b", "--bridge", dest="bridge",
help="Bridge to connect this instance to",
default=None, type="string", metavar="<bridge>"),
+ make_option("--mac", dest="mac",
+ help="MAC address", default=None,
+ type="string", metavar="<MACADDRESS>"),
+ make_option("--kernel", dest="kernel_path",
+ help="Path to the instances' kernel (or"
+ " 'default')", default=None,
+ type="string", metavar="<FILENAME>"),
+ make_option("--initrd", dest="initrd_path",
+ help="Path to the instances' initrd (or 'none', or"
+ " 'default')", default=None,
+ type="string", metavar="<FILENAME>"),
+ make_option("--hvm-boot-order", dest="hvm_boot_order",
+ help="boot device order for HVM"
+ "(either one or more of [acdn] or 'default')",
+ default=None, type="string", metavar="<BOOTORDER>"),
+ make_option("--hvm-acpi", dest="hvm_acpi",
+ help="ACPI support for HVM (true|false)",
+ metavar="<BOOL>", choices=["true", "false"]),
+ make_option("--hvm-pae", dest="hvm_pae",
+ help="PAE support for HVM (true|false)",
+ metavar="<BOOL>", choices=["true", "false"]),
+ make_option("--hvm-cdrom-image-path",
+ dest="hvm_cdrom_image_path",
+ help="CDROM image path for HVM"
+ "(absolute path or None)",
+ default=None, type="string", metavar="<CDROMIMAGE>"),
+ make_option("--hvm-nic-type", dest="hvm_nic_type",
+ help="Type of virtual NIC for HVM "
+ "(rtl8139,ne2k_pci,ne2k_isa,paravirtual)",
+ metavar="NICTYPE",
+ choices=[constants.HT_HVM_NIC_RTL8139,
+ constants.HT_HVM_NIC_NE2K_PCI,
+ constants.HT_HVM_NIC_NE2K_ISA,
+ constants.HT_HVM_DEV_PARAVIRTUAL],
+ default=None),
+ make_option("--hvm-disk-type", dest="hvm_disk_type",
+ help="Type of virtual disks for HVM "
+ "(ioemu,paravirtual)",
+ metavar="DISKTYPE",
+ choices=[constants.HT_HVM_DEV_IOEMU,
+ constants.HT_HVM_DEV_PARAVIRTUAL],
+ default=None),
+ make_option("--vnc-bind-address", dest="vnc_bind_address",
+ help="bind address for VNC (IP address)",
+ default=None, type="string", metavar="<VNCADDRESS>"),
+ SUBMIT_OPT,
],
"<instance>", "Alters the parameters of an instance"),
'shutdown': (ShutdownInstance, ARGS_ANY,
[DEBUG_OPT, m_node_opt, m_pri_node_opt, m_sec_node_opt,
- m_clust_opt, m_inst_opt, m_force_multi],
+ m_clust_opt, m_inst_opt, m_force_multi,
+ SUBMIT_OPT,
+ ],
"<instance>", "Stops an instance"),
'startup': (StartupInstance, ARGS_ANY,
[DEBUG_OPT, FORCE_OPT, m_force_multi,
default=None, type="string", metavar="<PARAMS>"),
m_node_opt, m_pri_node_opt, m_sec_node_opt,
m_clust_opt, m_inst_opt,
+ SUBMIT_OPT,
],
"<instance>", "Starts an instance"),
help="Ignore errors from secondaries"),
m_node_opt, m_pri_node_opt, m_sec_node_opt,
m_clust_opt, m_inst_opt,
+ SUBMIT_OPT,
],
"<instance>", "Reboots an instance"),
- 'activate-disks': (ActivateDisks, ARGS_ONE, [DEBUG_OPT],
+ 'activate-disks': (ActivateDisks, ARGS_ONE, [DEBUG_OPT, SUBMIT_OPT],
"<instance>",
"Activate an instance's disks"),
- 'deactivate-disks': (DeactivateDisks, ARGS_ONE, [DEBUG_OPT],
+ 'deactivate-disks': (DeactivateDisks, ARGS_ONE, [DEBUG_OPT, SUBMIT_OPT],
"<instance>",
"Deactivate an instance's disks"),
+ 'grow-disk': (GrowDisk, ARGS_FIXED(3), [DEBUG_OPT, SUBMIT_OPT],
+ "<instance> <disk> <size>", "Grow an instance's disk"),
'list-tags': (ListTags, ARGS_ONE, [DEBUG_OPT],
- "<node_name>", "List the tags of the given instance"),
+ "<instance_name>", "List the tags of the given instance"),
'add-tags': (AddTags, ARGS_ATLEAST(1), [DEBUG_OPT, TAG_SRC_OPT],
- "<node_name> tag...", "Add tags to the given instance"),
+ "<instance_name> tag...", "Add tags to the given instance"),
'remove-tags': (RemoveTags, ARGS_ATLEAST(1), [DEBUG_OPT, TAG_SRC_OPT],
- "<node_name> tag...", "Remove tags from given instance"),
+ "<instance_name> tag...", "Remove tags from given instance"),
+ }
+
+aliases = {
+ 'activate_block_devs': 'activate-disks',
+ 'replace_disks': 'replace-disks',
+ 'start': 'startup',
+ 'stop': 'shutdown',
}
if __name__ == '__main__':
- sys.exit(GenericMain(commands,
+ sys.exit(GenericMain(commands, aliases=aliases,
override={"tag_type": constants.TAG_INSTANCE}))
projects / ganeti-local / blobdiff