Adapt parameters that moved to instance variables

Due to a change in the code organization in stable-2.9, some
method variables became instance variables, causing a semantic
merge conflict. Fix this.

Signed-off-by: Klaus Aehlig <aehlig@google.com>
Reviewed-by: Helga Velroyen <helgav@google.com>

diff --git a/lib/cmdlib/instance_migration.py b/lib/cmdlib/instance_migration.py
index 92b29d6..7d45b4f 100644 (file)
--- a/lib/cmdlib/instance_migration.py
+++ b/lib/cmdlib/instance_migration.py
@@ -722,8 +722,8 @@ class TLMigrateInstance(Tasklet):
     self.feedback_fn("* preparing %s to accept the instance" %
                      self.cfg.GetNodeName(self.target_node_uuid))
     # This fills physical_id slot that may be missing on newly created disks
-    for disk in instance.disks:
-      self.cfg.SetDiskID(disk, target_node)
+    for disk in self.instance.disks:
+      self.cfg.SetDiskID(disk, self.target_node_uuid)
     result = self.rpc.call_accept_instance(self.target_node_uuid,
                                            self.instance,
                                            migration_info,