bash_completion: Move common code into function

[ganeti-local] / qa / qa_os.py

diff --git a/qa/qa_os.py b/qa/qa_os.py
index 5383d07..4b6fa5e 100644 (file)
--- a/qa/qa_os.py
+++ b/qa/qa_os.py
@@ -1,3 +1,6 @@
+#
+#
+
 # Copyright (C) 2007 Google Inc.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -69,13 +72,14 @@ def _SetupTempOs(node, dir, valid):
   if valid:
     parts.append(sq(["ln", "-fs", "/bin/true", "create"]))
 
-  parts.append(sq(["echo", str(constants.OS_API_VERSION)]) +
+  parts.append(sq(["echo", str(constants.OS_API_V10)]) +
                " >ganeti_api_version")
 
   cmd = ' && '.join(parts)
 
-  qa_utils.PrintInfo("Setting up %s with %s OS definition" %
-                     (node["primary"], ["an invalid", "a valid"][int(valid)]))
+  print qa_utils.FormatInfo("Setting up %s with %s OS definition" %
+                            (node["primary"],
+                             ["an invalid", "a valid"][int(valid)]))
 
   AssertEqual(StartSSH(node['primary'], cmd).wait(), 0)