X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/ed54b47eec1194dd6f669144f33bf5e734d1f255..a10caf87a59b8ad16b9d234bc9b0175dfe6f0c5a:/qa/ganeti-qa.py

diff --git a/qa/ganeti-qa.py b/qa/ganeti-qa.py
index c4573ce..4c2a2fc 100755
--- a/qa/ganeti-qa.py
+++ b/qa/ganeti-qa.py
@@ -21,10 +21,6 @@
 
 """Script for doing QA on Ganeti.
 
-You can create the required known_hosts file using ssh-keyscan. It's mandatory
-to use the full name of a node (FQDN). For security reasons, verify the keys
-before using them.
-Example: ssh-keyscan -t rsa node{1,2,3,4}.example.com > known_hosts
 """
 
 import sys
@@ -38,7 +34,6 @@ import qa_env
 import qa_instance
 import qa_node
 import qa_os
-import qa_other
 import qa_rapi
 import qa_tags
 import qa_utils
@@ -79,8 +74,9 @@ def SetupCluster():
   """Initializes the cluster.
 
   """
-  RunTest(qa_cluster.TestClusterInit)
-  RunTest(qa_node.TestNodeAddAll)
+  if qa_config.TestEnabled('create-cluster'):
+    RunTest(qa_cluster.TestClusterInit)
+    RunTest(qa_node.TestNodeAddAll)
   if qa_config.TestEnabled('node-info'):
     RunTest(qa_node.TestNodeInfo)
 
@@ -241,20 +237,16 @@ def main():
   """Main program.
 
   """
-  parser = optparse.OptionParser(usage="%prog [options] <config-file>"
-                                       " <known-hosts-file>")
-  parser.add_option('--dry-run', dest='dry_run',
-      action="store_true",
-      help="Show what would be done")
+  parser = optparse.OptionParser(usage="%prog [options] <config-file>")
   parser.add_option('--yes-do-it', dest='yes_do_it',
       action="store_true",
       help="Really execute the tests")
   (qa_config.options, args) = parser.parse_args()
 
-  if len(args) == 2:
-    (config_file, known_hosts_file) = args
+  if len(args) == 1:
+    (config_file, ) = args
   else:
-    parser.error("Not enough arguments.")
+    parser.error("Wrong number of arguments.")
 
   if not qa_config.options.yes_do_it:
     print ("Executing this script irreversibly destroys any Ganeti\n"
@@ -264,8 +256,6 @@ def main():
 
   qa_config.Load(config_file)
 
-  RunTest(qa_other.UploadKnownHostsFile, known_hosts_file)
-
   RunEnvTests()
   SetupCluster()
   RunClusterTests()
@@ -319,7 +309,8 @@ def main():
   finally:
     qa_config.ReleaseNode(pnode)
 
-  RunTest(qa_node.TestNodeRemoveAll)
+  if qa_config.TestEnabled('create-cluster'):
+    RunTest(qa_node.TestNodeRemoveAll)
 
   if qa_config.TestEnabled('cluster-destroy'):
     RunTest(qa_cluster.TestClusterDestroy)