Commit 6e2dc934 authored by Alexander Schreiber's avatar Alexander Schreiber
Browse files

Make burnin aware of hvm device type flags.

Merged from branches/ganeti/ganeti-1.2 r1648
Use static values for new hvm instance flags

Reviewed-by: iustinp
parent 64d3bd52
......@@ -236,7 +236,11 @@ class Burner(object):
hvm_boot_order=None,
file_driver="loop",
file_storage_dir=None,
iallocator=self.opts.iallocator)
iallocator=self.opts.iallocator,
auto_balance=True,
hvm_nic_type=constants.HT_HVM_NIC_RTL8139,
hvm_disk_type=constants.HT_HVM_DEV_IOEMU)
self.ExecOp(op)
self.to_rem.append(instance)
......@@ -327,7 +331,13 @@ class Burner(object):
mac="auto",
file_storage_dir=None,
file_driver=None,
iallocator=self.opts.iallocator)
iallocator=self.opts.iallocator,
auto_balance=True,
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))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment