X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/739ecd568422d9dd6a8ad8ccbde608d8a4bb38bd..13c24581a3700d3f00110a4b9ede71b4e417e2bd:/scripts/gnt-instance diff --git a/scripts/gnt-instance b/scripts/gnt-instance index 25edadf..464ead3 100755 --- a/scripts/gnt-instance +++ b/scripts/gnt-instance @@ -21,6 +21,7 @@ import sys import os +import itertools from optparse import make_option from cStringIO import StringIO @@ -29,10 +30,135 @@ from ganeti import opcodes from ganeti import logger from ganeti import constants from ganeti import utils +from ganeti import errors + + +_SHUTDOWN_CLUSTER = "cluster" +_SHUTDOWN_NODES_BOTH = "nodes" +_SHUTDOWN_NODES_PRI = "nodes-pri" +_SHUTDOWN_NODES_SEC = "nodes-sec" +_SHUTDOWN_INSTANCES = "instances" + +def _ExpandMultiNames(mode, names): + """Expand the given names using the passed mode. + + Args: + - mode, which can be one of _SHUTDOWN_CLUSTER, _SHUTDOWN_NODES_BOTH, + _SHUTDOWN_NODES_PRI, _SHUTDOWN_NODES_SEC or _SHUTDOWN_INSTANCES + - names, which is a list of names; for cluster, it must be empty, + and for node and instance it must be a list of valid item + names (short names are valid as usual, e.g. node1 instead of + node1.example.com) + + For _SHUTDOWN_CLUSTER, all instances will be returned. For + _SHUTDOWN_NODES_PRI/SEC, all instances having those nodes as + primary/secondary will be shutdown. For _SHUTDOWN_NODES_BOTH, all + instances having those nodes as either primary or secondary will be + returned. For _SHUTDOWN_INSTANCES, the given instances will be + returned. + + """ + 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) + inames = [row[0] for row in idata] + + elif mode in (_SHUTDOWN_NODES_BOTH, + _SHUTDOWN_NODES_PRI, + _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) + ipri = [row[1] for row in ndata] + pri_names = list(itertools.chain(*ipri)) + isec = [row[2] for row in ndata] + sec_names = list(itertools.chain(*isec)) + if mode == _SHUTDOWN_NODES_BOTH: + inames = pri_names + sec_names + elif mode == _SHUTDOWN_NODES_PRI: + inames = pri_names + elif mode == _SHUTDOWN_NODES_SEC: + inames = sec_names + else: + raise errors.ProgrammerError("Unhandled shutdown type") + + 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) + inames = [row[0] for row in idata] + + else: + raise errors.OpPrereqError("Unknown mode '%s'" % mode) + + return inames + + +def _ConfirmOperation(inames, text): + """Ask the user to confirm an operation on a list of instances. + + This function is used to request confirmation for doing an operation + on a given list of instances. + + The inames argument is what the selection algorithm computed, and + the text argument is the operation we should tell the user to + confirm (e.g. 'shutdown' or 'startup'). + + Returns: boolean depending on user's confirmation. + + """ + count = len(inames) + msg = ("The %s will operate on %d instances.\n" + "Do you want to continue?" % (text, count)) + affected = ("\nAffected instances:\n" + + "\n".join([" %s" % name for name in inames])) + + choices = [('y', True, 'Yes, execute the %s' % text), + ('n', False, 'No, abort the %s' % text)] + + if count > 20: + choices.insert(1, ('v', 'v', 'View the list of affected instances')) + ask = msg + else: + ask = msg + affected + + choice = AskUser(ask, choices) + if choice == 'v': + choices.pop(1) + choice = AskUser(choices, msg + affected) + 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 nodes and their properties. + """List instances and their properties. """ if opts.output is None: @@ -41,7 +167,7 @@ def ListInstances(opts, args): else: selected_fields = opts.output.split(",") - op = opcodes.OpQueryInstances(output_fields=selected_fields) + op = opcodes.OpQueryInstances(output_fields=selected_fields, names=[]) output = SubmitOpCode(op) if not opts.no_headers: @@ -50,20 +176,50 @@ def ListInstances(opts, args): "oper_state": "Status", "admin_ram": "Configured_memory", "oper_ram": "Memory", "disk_template": "Disk_template", "ip": "IP Address", "mac": "MAC Address", - "bridge": "Bridge"} + "bridge": "Bridge", + "sda_size": "Disk/0", "sdb_size": "Disk/1"} else: headers = None if opts.human_readable: - unitfields = ["admin_ram", "oper_ram"] + unitfields = ["admin_ram", "oper_ram", "sda_size", "sdb_size"] else: unitfields = None - numfields = ["admin_ram", "oper_ram"] - - OutputTable(separator=opts.separator, headers=headers, - fields=selected_fields, unitfields=unitfields, - numfields=numfields, data=output) + numfields = ["admin_ram", "oper_ram", "sda_size", "sdb_size"] + + # change raw values to nicer strings + for row in output: + for idx, field in enumerate(selected_fields): + val = row[idx] + if field == "snodes": + val = ",".join(val) or "-" + elif field == "admin_state": + if val: + val = "yes" + else: + val = "no" + elif field == "oper_state": + if val is None: + val = "(node down)" + elif val: # True + val = "running" + else: + val = "stopped" + elif field == "oper_ram": + if val is None: + val = "(node down)" + elif field == "sda_size" or field == "sdb_size": + if val is None: + val = "N/A" + row[idx] = str(val) + + data = GenerateTable(separator=opts.separator, headers=headers, + fields=selected_fields, unitfields=unitfields, + numfields=numfields, data=output) + + for line in data: + logger.ToStdout(line) return 0 @@ -83,14 +239,24 @@ def AddInstance(opts, args): """ instance = args[0] + (pnode, snode) = SplitNodeOption(opts.node) + + kernel_path = _TransformPath(opts.kernel_path) + initrd_path = _TransformPath(opts.initrd_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, - ip=opts.ip, bridge=opts.bridge, start=True, - wait_for_sync=opts.wait_for_sync) + 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, + mac=opts.mac, + kernel_path=kernel_path, + initrd_path=initrd_path, + hvm_boot_order=opts.hvm_boot_order) SubmitOpCode(op) return 0 @@ -106,9 +272,9 @@ def ReinstallInstance(opts, args): instance_name = args[0] if not opts.force: - usertext = ("This will reinstall the instance %s and remove " - "all data. Continue?") % instance_name - if not opts._ask_user(usertext): + 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, @@ -133,11 +299,28 @@ def RemoveInstance(opts, args): usertext = ("This will remove the volumes of the instance %s" " (including mirrors), thus removing all the data" " of the instance. Continue?") % instance_name - if not opts._ask_user(usertext): + if not AskUser(usertext): return 1 - op = opcodes.OpRemoveInstance(instance_name=instance_name) + op = opcodes.OpRemoveInstance(instance_name=instance_name, + ignore_failures=opts.ignore_failures) + SubmitOpCode(op) + return 0 + + +def RenameInstance(opts, args): + """Rename an instance. + + Args: + opts - class with options as members + args - list containing two elements, the instance name and the new name + + """ + op = opcodes.OpRenameInstance(instance_name=args[0], + new_name=args[1], + ignore_ip=opts.ignore_ip) SubmitOpCode(op) + return 0 @@ -172,19 +355,55 @@ def DeactivateDisks(opts, args): def StartupInstance(opts, args): - """Shutdown an instance. + """Startup an instance. Args: opts - class with options as members args - list containing a single element, the instance name """ - instance_name = args[0] - op = opcodes.OpStartupInstance(instance_name=instance_name, force=opts.force, - extra_args=opts.extra_args) - SubmitOpCode(op) + 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")): + return 1 + for name in inames: + op = opcodes.OpStartupInstance(instance_name=name, + force=opts.force, + extra_args=opts.extra_args) + if multi_on: + logger.ToStdout("Starting up %s" % name) + SubmitOpCode(op) return 0 +def RebootInstance(opts, args): + """Reboot an instance + + Args: + opts - class with options as members + args - list containing a single element, the instance name + + """ + 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")): + return 1 + for name in inames: + op = opcodes.OpRebootInstance(instance_name=name, + reboot_type=opts.reboot_type, + ignore_secondaries=opts.ignore_secondaries) + + SubmitOpCode(op) + return 0 def ShutdownInstance(opts, args): """Shutdown an instance. @@ -194,9 +413,20 @@ def ShutdownInstance(opts, args): args - list containing a single element, the instance name """ - instance_name = args[0] - op = opcodes.OpShutdownInstance(instance_name=instance_name) - SubmitOpCode(op) + 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")): + return 1 + for name in inames: + op = opcodes.OpShutdownInstance(instance_name=name) + if multi_on: + logger.ToStdout("Shutting down %s" % name) + SubmitOpCode(op) return 0 @@ -216,7 +446,7 @@ def AddMDDRBDComponent(opts, args): def RemoveMDDRBDComponent(opts, args): - """Connect to the console of an instance + """Remove a component from a remote_raid1 disk. Args: opts - class with options as members @@ -239,9 +469,23 @@ def ReplaceDisks(opts, args): """ instance_name = args[0] - new_secondary = opts.new_secondary - op = opcodes.OpReplaceDisks(instance_name=args[0], - remote_node=opts.new_secondary) + new_2ndary = opts.new_secondary + 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: + raise errors.OpPrereqError("Can't change secondary node on primary disk" + " replacement") + elif opts.on_secondary 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) SubmitOpCode(op) return 0 @@ -266,7 +510,7 @@ def FailoverInstance(opts, args): usertext = ("Failover will happen to image %s." " This requires a shutdown of the instance. Continue?" % (instance_name,)) - if not opts._ask_user(usertext): + if not AskUser(usertext): return 1 op = opcodes.OpFailoverInstance(instance_name=instance_name, @@ -286,14 +530,14 @@ def ConnectToInstanceConsole(opts, args): instance_name = args[0] op = opcodes.OpConnectConsole(instance_name=instance_name) - node, console_cmd = SubmitOpCode(op) + cmd, argv = SubmitOpCode(op) # drop lock and exec so other commands can run while we have console utils.Unlock("cmd") try: - os.execv("/usr/bin/ssh", ["ssh", "-qt", node, console_cmd]) + os.execvp(cmd, argv) finally: - sys.stderr.write("Can't run console command %s on node %s" % - (console_cmd, node)) + sys.stderr.write("Can't run console command %s with arguments:\n'%s'" % + (cmd, " ".join(argv))) os._exit(1) @@ -309,9 +553,9 @@ def _FormatBlockDevInfo(buf, dev, indent_level): if not status: buf.write("not active\n") else: - (path, major, minor, syncp, estt, degr) = status + (path, major, minor, syncp, estt, degr, ldisk) = status buf.write("%s (%d:%d)" % (path, major, minor)) - if dtype in ("md_raid1", "drbd"): + if dtype in (constants.LD_MD_R1, constants.LD_DRBD7, constants.LD_DRBD8): if syncp is not None: sync_text = "*RECOVERING* %5.2f%%," % syncp if estt: @@ -324,7 +568,17 @@ def _FormatBlockDevInfo(buf, dev, indent_level): 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: @@ -372,7 +626,22 @@ def ShowInstanceConfig(opts, args): buf.write(" - primary: %s\n" % instance["pnode"]) buf.write(" - secondaries: %s\n" % ", ".join(instance["snodes"])) buf.write(" Operating system: %s\n" % instance["os"]) + buf.write(" Allocated network port: %s\n" % instance["network_port"]) + 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) + buf.write(" HVM boot order: %s\n" % instance["hvm_boot_order"]) buf.write(" Hardware:\n") + buf.write(" - VCPUs: %d\n" % instance["vcpus"]) buf.write(" - memory: %dMiB\n" % instance["memory"]) buf.write(" - NICs: %s\n" % ", ".join(["{MAC: %s, IP: %s, bridge: %s}" % @@ -398,15 +667,27 @@ def SetInstanceParms(opts, args): 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): logger.ToStdout("Please give at least one of the parameters.") return 1 + 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 + op = opcodes.OpSetInstanceParms(instance_name=args[0], mem=opts.mem, vcpus=opts.vcpus, ip=opts.ip, - bridge=opts.bridge) + bridge=opts.bridge, mac=opts.mac, + kernel_path=opts.kernel_path, + initrd_path=opts.initrd_path, + hvm_boot_order=hvm_boot_order) result = SubmitOpCode(op) if result: @@ -425,33 +706,81 @@ node_opt = make_option("-n", "--node", dest="node", help="Target node", os_opt = cli_option("-o", "--os-type", dest="os", help="What OS to run", metavar="") +# multi-instance selection options +m_force_multi = make_option("--force-multiple", dest="force_multi", + help="Do not ask for confirmation when more than" + " one instance is affected", + action="store_true", default=False) + +m_pri_node_opt = make_option("--primary", dest="multi_mode", + help="Filter by nodes (primary only)", + const=_SHUTDOWN_NODES_PRI, action="store_const") + +m_sec_node_opt = make_option("--secondary", dest="multi_mode", + help="Filter by nodes (secondary only)", + const=_SHUTDOWN_NODES_SEC, action="store_const") + +m_node_opt = make_option("--node", dest="multi_mode", + help="Filter by nodes (primary and secondary)", + const=_SHUTDOWN_NODES_BOTH, action="store_const") + +m_clust_opt = make_option("--all", dest="multi_mode", + help="Select all instances in the cluster", + const=_SHUTDOWN_CLUSTER, action="store_const") + +m_inst_opt = make_option("--instance", dest="multi_mode", + help="Filter by instance name [default]", + const=_SHUTDOWN_INSTANCES, action="store_const") + + # this is defined separately due to readability only add_opts = [ DEBUG_OPT, - node_opt, - cli_option("-s", "--os-size", dest="size", help="Disk size", + make_option("-n", "--node", dest="node", + help="Target node and optional secondary node", + metavar="[:]"), + cli_option("-s", "--os-size", dest="size", help="Disk size, in MiB unless" + " a suffix is used", default=20 * 1024, type="unit", metavar=""), - cli_option("--swap-size", dest="swap", help="Swap size", + cli_option("--swap-size", dest="swap", help="Swap size, in MiB unless a" + " suffix is used", default=4 * 1024, type="unit", metavar=""), os_opt, - cli_option("-m", "--memory", dest="mem", help="Memory size", + cli_option("-m", "--memory", dest="mem", help="Memory size (in MiB)", default=128, type="unit", metavar=""), make_option("-p", "--cpu", dest="vcpus", help="Number of virtual CPUs", default=1, type="int", metavar=""), 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, plain, local_raid1," + " remote_raid1 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="
"), + make_option("--mac", dest="mac", + help="MAC address ('auto' [default], or specify address)", + default='auto', type="string", metavar=""), 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=""), make_option("-b", "--bridge", dest="bridge", help="Bridge to connect this instance to", - default=None, metavar="") + default=None, metavar=""), + make_option("--no-start", dest="start", default=True, + action="store_false", help="Don't start the instance after" + " creation"), + 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=""), + make_option("--initrd", dest="initrd_path", + help="Path to the instances' initrd (or 'none', or 'default')", + default=None, + type="string", metavar=""), + 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=""), ] commands = { @@ -485,7 +814,14 @@ commands = { "", "Lists the instances and their status"), 'reinstall': (ReinstallInstance, ARGS_ONE, [DEBUG_OPT, FORCE_OPT, os_opt], "[-f] ", "Reinstall the instance"), - 'remove': (RemoveInstance, ARGS_ONE, [DEBUG_OPT, FORCE_OPT], + 'remove': (RemoveInstance, ARGS_ONE, + [DEBUG_OPT, FORCE_OPT, + make_option("--ignore-failures", dest="ignore_failures", + action="store_true", default=False, + help=("Remove the instance from the cluster even" + " if there are failures during the removal" + " process (shutdown, disk removal, etc.)")), + ], "[-f] ", "Shuts down the instance and removes it"), 'remove-mirror': (RemoveMDDRBDComponent, ARGS_ONE, [DEBUG_OPT, node_opt, @@ -499,12 +835,32 @@ commands = { ], "-b disk -p port ", "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"), + ], + " ", "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)"))], + 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")), + ], "[-n NODE] ", "Replaces all disks for the instance"), 'modify': (SetInstanceParms, ARGS_ONE, @@ -520,26 +876,68 @@ commands = { default=None, type="string", metavar="
"), make_option("-b", "--bridge", dest="bridge", help="Bridge to connect this instance to", - default=None, type="string", metavar="") + default=None, type="string", metavar=""), + make_option("--mac", dest="mac", + help="MAC address", default=None, + type="string", metavar=""), + make_option("--kernel", dest="kernel_path", + help="Path to the instances' kernel (or" + " 'default')", default=None, + type="string", metavar=""), + make_option("--initrd", dest="initrd_path", + help="Path to the instances' initrd (or 'none', or" + " 'default')", default=None, + type="string", metavar=""), + 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=""), ], "", "Alters the parameters of an instance"), - 'shutdown': (ShutdownInstance, ARGS_ONE, [DEBUG_OPT], + '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], "", "Stops an instance"), - 'startup': (StartupInstance, ARGS_ONE, - [DEBUG_OPT, FORCE_OPT, + 'startup': (StartupInstance, ARGS_ANY, + [DEBUG_OPT, FORCE_OPT, m_force_multi, make_option("-e", "--extra", dest="extra_args", help="Extra arguments for the instance's kernel", default=None, type="string", metavar=""), + m_node_opt, m_pri_node_opt, m_sec_node_opt, + m_clust_opt, m_inst_opt, ], "", "Starts an instance"), + + 'reboot': (RebootInstance, ARGS_ANY, + [DEBUG_OPT, m_force_multi, + make_option("-e", "--extra", dest="extra_args", + help="Extra arguments for the instance's kernel", + default=None, type="string", metavar=""), + make_option("-t", "--type", dest="reboot_type", + help="Type of reboot: soft/hard/full", + default=constants.INSTANCE_REBOOT_SOFT, + type="string", metavar=""), + make_option("--ignore-secondaries", dest="ignore_secondaries", + default=False, action="store_true", + help="Ignore errors from secondaries"), + m_node_opt, m_pri_node_opt, m_sec_node_opt, + m_clust_opt, m_inst_opt, + ], + "", "Reboots an instance"), 'activate-disks': (ActivateDisks, ARGS_ONE, [DEBUG_OPT], "", "Activate an instance's disks"), 'deactivate-disks': (DeactivateDisks, ARGS_ONE, [DEBUG_OPT], "", "Deactivate an instance's disks"), + 'list-tags': (ListTags, ARGS_ONE, [DEBUG_OPT], + "", "List the tags of the given instance"), + 'add-tags': (AddTags, ARGS_ATLEAST(1), [DEBUG_OPT, TAG_SRC_OPT], + " tag...", "Add tags to the given instance"), + 'remove-tags': (RemoveTags, ARGS_ATLEAST(1), [DEBUG_OPT, TAG_SRC_OPT], + " tag...", "Remove tags from given instance"), } if __name__ == '__main__': - retcode = GenericMain(commands) - sys.exit(retcode) + sys.exit(GenericMain(commands, + override={"tag_type": constants.TAG_INSTANCE}))