Update document describing cluster security

[ganeti-local] / tools / burnin

diff --git a/tools/burnin b/tools/burnin
index 04a1bf7..f5b9b1a 100755 (executable)
--- a/tools/burnin
+++ b/tools/burnin
@@ -82,7 +82,8 @@ class Burner(object):
 
   def Feedback(self, msg):
     """Acumulate feedback in our buffer."""
-    self._feed_buf.write("%s %s\n" % (time.ctime(msg[0]), msg[2]))
+    self._feed_buf.write("%s %s\n" % (time.ctime(utils.MergeTime(msg[0])),
+                                      msg[2]))
     if self.opts.verbose:
       Log(msg)
 
@@ -235,7 +236,10 @@ class Burner(object):
                                     hvm_boot_order=None,
                                     file_driver="loop",
                                     file_storage_dir=None,
-                                    iallocator=self.opts.iallocator)
+                                    iallocator=self.opts.iallocator,
+                                    hvm_nic_type=constants.HT_HVM_NIC_RTL8139,
+                                    hvm_disk_type=constants.HT_HVM_DEV_IOEMU)
+
       self.ExecOp(op)
       self.to_rem.append(instance)
 
@@ -326,7 +330,12 @@ class Burner(object):
                                         mac="auto",
                                         file_storage_dir=None,
                                         file_driver=None,
-                                        iallocator=self.opts.iallocator)
+                                        iallocator=self.opts.iallocator,
+                                        hvm_nic_type=
+                                        constants.HT_HVM_NIC_RTL8139,
+                                        hvm_disk_type=
+                                        constants.HT_HVM_DEV_IOEMU)
+
       erem_op = opcodes.OpRemoveExport(instance_name=instance)
 
       Log("- Export instance %s to node %s" % (instance, enode))