Convert AddOSToInstance to (status, data)

[ganeti-local] / lib / backend.py

diff --git a/lib/backend.py b/lib/backend.py
index 09a5b88..2ce1385 100644 (file)
--- a/lib/backend.py
+++ b/lib/backend.py
@@ -681,9 +681,12 @@ def AddOSToInstance(instance):
     logging.error("os create command '%s' returned error: %s, logfile: %s,"
                   " output: %s", result.cmd, result.fail_reason, logfile,
                   result.output)
-    return False
+    lines = [val.encode("string_escape")
+             for val in utils.TailFile(logfile, lines=20)]
+    return (False, "OS create script failed (%s), last lines in the"
+            " log file:\n%s" % (result.fail_reason, "\n".join(lines)))
 
-  return True
+  return (True, "Successfully installed")
 
 
 def RunRenameInstance(instance, old_name):