burnin: improve instance create message

[ganeti-local] / tools / burnin

diff --git a/tools/burnin b/tools/burnin
index 9dddb13..dc1205a 100755 (executable)
--- a/tools/burnin
+++ b/tools/burnin
@@ -132,9 +132,9 @@ class Burner(object):
                       default=True)
     parser.add_option("-t", "--disk-template", dest="disk_template",
                       choices=("diskless", "plain", "remote_raid1", "drbd"),
-                      default="remote_raid1",
-                      help="Template type for network mirroring (remote_raid1"
-                      " or drbd) [remote_raid1]")
+                      default="drbd",
+                      help="Template type (plain, diskless, drbd, remote_raid1)"
+                      " [drbd]")
     parser.add_option("-n", "--nodes", dest="nodes", default="",
                       help="Comma separated list of nodes to perform"
                       " the burnin on (defaults to all nodes)")
@@ -209,6 +209,14 @@ class Burner(object):
     for pnode, snode, instance in mytor:
       if self.opts.iallocator:
         pnode = snode = None
+        Log("- Add instance %s (iallocator: %s)" %
+              (instance, self.opts.iallocator))
+      elif self.opts.disk_template not in constants.DTS_NET_MIRROR:
+        snode = None
+        Log("- Add instance %s on node %s" % (instance, pnode))
+      else:
+        Log("- Add instance %s on nodes %s/%s" % (instance, pnode, snode))
+
       op = opcodes.OpCreateInstance(instance_name=instance,
                                     mem_size=128,
                                     disk_size=self.opts.os_size,
@@ -227,7 +235,6 @@ class Burner(object):
                                     initrd_path=None,
                                     hvm_boot_order=None,
                                     iallocator=self.opts.iallocator)
-      Log("- Add instance %s on nodes %s/%s" % (instance, pnode, snode))
       self.ExecOp(op)
       self.to_rem.append(instance)