Fix gnt-instance modify breakage due to hvm_boot_order
[ganeti-local] / scripts / gnt-instance
index be74647..464ead3 100755 (executable)
@@ -134,8 +134,31 @@ def _ConfirmOperation(inames, text):
   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:
@@ -216,15 +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,
+                                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)
+                                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
 
@@ -240,8 +272,8 @@ 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
+    usertext = ("This will reinstall the instance %s and remove"
+                " all data. Continue?") % instance_name
     if not AskUser(usertext):
       return 1
 
@@ -270,7 +302,8 @@ def RemoveInstance(opts, args):
     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
 
@@ -332,6 +365,8 @@ def StartupInstance(opts, args):
   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")):
@@ -345,6 +380,30 @@ def StartupInstance(opts, args):
     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.
@@ -357,6 +416,8 @@ def ShutdownInstance(opts, args):
   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")):
@@ -408,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
 
@@ -478,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:
@@ -493,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:
@@ -541,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}" %
@@ -567,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:
@@ -624,7 +736,9 @@ m_inst_opt = make_option("--instance", dest="multi_mode",
 # 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>"),
@@ -637,16 +751,16 @@ add_opts = [
   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, 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="<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>"),
@@ -656,6 +770,17 @@ add_opts = [
   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>"),
   ]
 
 commands = {
@@ -689,7 +814,14 @@ commands = {
            "", "Lists the instances and their status"),
   'reinstall': (ReinstallInstance, ARGS_ONE, [DEBUG_OPT, FORCE_OPT, os_opt],
                 "[-f] <instance>", "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] <instance>", "Shuts down the instance and removes it"),
   'remove-mirror': (RemoveMDDRBDComponent, ARGS_ONE,
                    [DEBUG_OPT, node_opt,
@@ -714,9 +846,21 @@ commands = {
   '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] <instance>",
                     "Replaces all disks for the instance"),
   'modify': (SetInstanceParms, ARGS_ONE,
@@ -733,6 +877,21 @@ commands = {
               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>"),
               ],
              "<instance>", "Alters the parameters of an instance"),
   'shutdown': (ShutdownInstance, ARGS_ANY,
@@ -748,6 +907,23 @@ commands = {
                m_clust_opt, m_inst_opt,
                ],
             "<instance>", "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="<PARAMS>"),
+               make_option("-t", "--type", dest="reboot_type",
+                           help="Type of reboot: soft/hard/full",
+                           default=constants.INSTANCE_REBOOT_SOFT,
+                           type="string", metavar="<REBOOT>"),
+               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,
+               ],
+            "<instance>", "Reboots an instance"),
   'activate-disks': (ActivateDisks, ARGS_ONE, [DEBUG_OPT],
                      "<instance>",
                      "Activate an instance's disks"),