Revision 62c9ec92 daemons/ganeti-noded
b/daemons/ganeti-noded | ||
---|---|---|
236 | 236 |
disk = objects.Disk.FromDict(params[0]) |
237 | 237 |
dest_node = params[1] |
238 | 238 |
instance = objects.Instance.FromDict(params[2]) |
239 |
return backend.ExportSnapshot(disk, dest_node, instance) |
|
239 |
cluster_name = params[3] |
|
240 |
return backend.ExportSnapshot(disk, dest_node, instance, cluster_name) |
|
240 | 241 |
|
241 | 242 |
@staticmethod |
242 | 243 |
def perspective_finalize_export(params): |
... | ... | |
333 | 334 |
"""Run the import function of an OS onto a given instance. |
334 | 335 |
|
335 | 336 |
""" |
336 |
inst_s, os_disk, swap_disk, src_node, src_image = params |
|
337 |
inst_s, os_disk, swap_disk, src_node, src_image, cluster_name = params
|
|
337 | 338 |
inst = objects.Instance.FromDict(inst_s) |
338 | 339 |
return backend.ImportOSIntoInstance(inst, os_disk, swap_disk, |
339 |
src_node, src_image) |
|
340 |
src_node, src_image, cluster_name)
|
|
340 | 341 |
|
341 | 342 |
@staticmethod |
342 | 343 |
def perspective_instance_shutdown(params): |
... | ... | |
425 | 426 |
"""Run a verify sequence on this node. |
426 | 427 |
|
427 | 428 |
""" |
428 |
return backend.VerifyNode(params[0]) |
|
429 |
return backend.VerifyNode(params[0], params[1])
|
|
429 | 430 |
|
430 | 431 |
@staticmethod |
431 | 432 |
def perspective_node_start_master(params): |
Also available in: Unified diff