Commit 980138db by Bach Dániel

vm: fix merge errors

parent b14ff508
......@@ -487,7 +487,12 @@ class MigrateOperation(RemoteInstanceOperation):
def _operation(self, activity, to_node=None):
if not to_node:
to_node = self.instance.reallocate_node(activity)
with activity.sub_activity('scheduling',
"schedule")) as sa:
to_node = self.instance.select_node()
sa.result = to_node
with activity.sub_activity(
'migrate_vm', readable_name=create_readable(
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