QA: Do not upload known_hosts file anymore

The cluster no longer keeps individual host's SSH key, but rather
aliases all of them to the cluster name.

Reviewed-by: ultrotter

diff --git a/Makefile.am b/Makefile.am
index 38efd06..c1d7cd7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -155,7 +155,6 @@ EXTRA_DIST = \
        qa/qa_instance.py \
        qa/qa_node.py \
        qa/qa_os.py \
-       qa/qa_other.py \
        qa/qa_rapi.py \
        qa/qa_tags.py \
        qa/qa_utils.py

diff --git a/qa/ganeti-qa.py b/qa/ganeti-qa.py
index c4573ce..727af97 100755 (executable)
--- 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
@@ -241,8 +236,7 @@ def main():
   """Main program.
 
   """
-  parser = optparse.OptionParser(usage="%prog [options] <config-file>"
-                                       " <known-hosts-file>")
+  parser = optparse.OptionParser(usage="%prog [options] <config-file>")
   parser.add_option('--dry-run', dest='dry_run',
       action="store_true",
       help="Show what would be done")
@@ -251,10 +245,10 @@ def main():
       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 +258,6 @@ def main():
 
   qa_config.Load(config_file)
 
-  RunTest(qa_other.UploadKnownHostsFile, known_hosts_file)
-
   RunEnvTests()
   SetupCluster()
   RunClusterTests()

diff --git a/qa/qa_other.py b/qa/qa_other.py
deleted file mode 100644 (file)
index ab7a898..0000000
--- a/qa/qa_other.py
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-#
-
-# Copyright (C) 2007 Google Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
-
-
-from ganeti import utils
-from ganeti import constants
-
-import qa_config
-import qa_utils
-
-from qa_utils import AssertEqual, StartSSH
-
-
-def UploadKnownHostsFile(localpath):
-  """Uploading known_hosts file.
-
-  """
-  master = qa_config.GetMasterNode()
-
-  tmpfile = qa_utils.UploadFile(master['primary'], localpath)
-  try:
-    cmd = ['mv', tmpfile, constants.SSH_KNOWN_HOSTS_FILE]
-    AssertEqual(StartSSH(master['primary'],
-                         utils.ShellQuoteArgs(cmd)).wait(), 0)
-  except:
-    cmd = ['rm', '-f', tmpfile]
-    AssertEqual(StartSSH(master['primary'],
-                utils.ShellQuoteArgs(cmd)).wait(), 0)
-    raise