Skip to content
Snippets Groups Projects
Commit 0ca35d45 authored by Guido Trotter's avatar Guido Trotter
Browse files

Burner: fix ImportExport

Update the call to CreateInstance used in ImportExport to the new API for
multidisk/nic.

Reviewed-by: iustinp
parent e36e96b4
No related branches found
No related tags found
No related merge requests found
...@@ -372,9 +372,10 @@ class Burner(object): ...@@ -372,9 +372,10 @@ class Burner(object):
full_name = self.ExecOp(nam_op)[0][0] full_name = self.ExecOp(nam_op)[0][0]
imp_dir = os.path.join(constants.EXPORT_DIR, full_name) imp_dir = os.path.join(constants.EXPORT_DIR, full_name)
imp_op = opcodes.OpCreateInstance(instance_name=instance, imp_op = opcodes.OpCreateInstance(instance_name=instance,
disk_size=self.opts.os_size, disks = [ {"size": size}
swap_size=self.opts.swap_size, for size in self.disk_size],
disk_template=self.opts.disk_template, disk_template=self.opts.disk_template,
nics=[{}],
mode=constants.INSTANCE_IMPORT, mode=constants.INSTANCE_IMPORT,
src_node=enode, src_node=enode,
src_path=imp_dir, src_path=imp_dir,
...@@ -383,9 +384,8 @@ class Burner(object): ...@@ -383,9 +384,8 @@ class Burner(object):
start=True, start=True,
ip_check=True, ip_check=True,
wait_for_sync=True, wait_for_sync=True,
mac="auto",
file_storage_dir=None, file_storage_dir=None,
file_driver=None, file_driver="loop",
iallocator=self.opts.iallocator, iallocator=self.opts.iallocator,
beparams=self.bep, beparams=self.bep,
hvparams=self.hvp, hvparams=self.hvp,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment