- Generic automake cleanup

[ganeti-local] / scripts / gnt-instance

diff --git a/scripts/gnt-instance b/scripts/gnt-instance
index 0ad1480..f10ae64 100755 (executable)
--- a/scripts/gnt-instance
+++ b/scripts/gnt-instance
@@ -50,20 +50,24 @@ 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"]
+  numfields = ["admin_ram", "oper_ram", "sda_size", "sdb_size"]
 
-  OutputTable(separator=opts.separator, headers=headers,
-      fields=selected_fields, unitfields=unitfields,
-      numfields=numfields, data=output)
+  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
 
@@ -286,14 +290,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)
 
 
@@ -429,12 +433,14 @@ os_opt = cli_option("-o", "--os-type", dest="os", help="What OS to run",
 add_opts = [
   DEBUG_OPT,
   node_opt,
-  cli_option("-s", "--os-size", dest="size", help="Disk size",
+  cli_option("-s", "--os-size", dest="size", help="Disk size, in MiB unless"
+             " a suffix is used",
              default=20 * 1024, type="unit", metavar="<size>"),
-  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="<size>"),
   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="<mem>"),
   make_option("-p", "--cpu", dest="vcpus", help="Number of virtual CPUs",
               default=1, type="int", metavar="<PROC>"),