Revision f9af35c8 tools/burnin

b/tools/burnin
288 288
                 self.instances)
289 289

  
290 290
    for pnode, snode, enode, instance in mytor:
291

  
292
      if self.opts.iallocator:
293
        pnode = snode = None
294
        import_log_msg = ("- Import instance %s from node %s (iallocator: %s)" %
295
                          (instance, enode, self.opts.iallocator))
296
      elif self.opts.disk_template not in constants.DTS_NET_MIRROR:
297
        snode = None
298
        import_log_msg = ("- Import instance %s from node %s to node %s" %
299
                          (instance, enode, pnode))
300
      else:
301
        import_log_msg = ("- Import instance %s from node %s to nodes %s/%s" %
302
                          (instance, enode, pnode, snode))
303

  
291 304
      exp_op = opcodes.OpExportInstance(instance_name=instance,
292 305
                                           target_node=enode,
293 306
                                           shutdown=True)
......
313 326
                                        wait_for_sync=True,
314 327
                                        mac="auto",
315 328
                                        file_storage_dir=None,
316
                                        file_driver=None)
329
                                        file_driver=None,
330
                                        iallocator=self.opts.iallocator)
317 331
      erem_op = opcodes.OpRemoveExport(instance_name=instance)
318 332

  
319 333
      Log("- Export instance %s to node %s" % (instance, enode))
......
321 335
      Log("- Remove instance %s" % (instance))
322 336
      self.ExecOp(rem_op)
323 337
      self.to_rem.remove(instance)
324
      Log("- Import instance %s from node %s to node %s" %
325
          (instance, enode, pnode))
338
      Log(import_log_msg)
326 339
      self.ExecOp(imp_op)
327 340
      Log("- Remove export of instance %s" % (instance))
328 341
      self.ExecOp(erem_op)

Also available in: Unified diff