Commit 7514b54e by Dudás Ádám

revise temporary fix of 0c033922

parent 1b8ae2d4
......@@ -341,12 +341,15 @@ class Instance(VirtualMachineDescModel, TimeStampedModel):
return " ".join([s for s in parts if s != ""])
def create_from_template(cls, template, owner, **kwargs):
def create_from_template(cls, template, owner, disks=None, **kwargs):
"""Create a new instance based on an InstanceTemplate.
Can also specify parameters as keyword arguments which should override
template settings.
if disks is None:
disks = template.disks.all()
# prepare parameters
kwargs['template'] = template
kwargs['owner'] = owner
......@@ -362,8 +365,6 @@ class Instance(VirtualMachineDescModel, TimeStampedModel):
kwargs.setdefault('raw_data', template.raw_data)
kwargs.setdefault('access_method', template.access_method)
disks = kwargs.get('disks', template.disks.all())
# create instance and do additional setup
inst = cls(**kwargs)
# save instance
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 sign in to comment