From: Michael Hanselmann <hansmi@google.com>
Date: Wed, 27 Apr 2011 15:15:47 +0000 (+0200)
Subject: TLMigrateInstance: Fix confusing text
X-Git-Tag: v2.5.0beta1~411
X-Git-Url: https://code.grnet.gr/git/ganeti-local/commitdiff_plain/c66270315d17bb9016b5453d14f4e9e4b07fea60

TLMigrateInstance: Fix confusing text

Commit d5cafd31 changed this error message, swapping the
text parts in the process.

Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
---

diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 08b6bf0..c5bb308 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -6455,10 +6455,10 @@ class TLMigrateInstance(Tasklet):
         else:
           text = "migrated"
         raise errors.OpPrereqError("Instances with disk template %s cannot"
-                                   " be %s over to arbitrary nodes"
+                                   " be %s to arbitrary nodes"
                                    " (neither an iallocator nor a target"
                                    " node can be passed)" %
-                                   (text, instance.disk_template),
+                                   (instance.disk_template, text),
                                    errors.ECODE_INVAL)
 
     i_be = self.cfg.GetClusterInfo().FillBE(instance)