diff --git a/qa/ganeti-qa.py b/qa/ganeti-qa.py index 727af9784ccdde5ceb74eabfab17dab88d5cc379..1bd4d5cdb5d02eb59e2d8f9692143b19a0b8d3c0 100755 --- a/qa/ganeti-qa.py +++ b/qa/ganeti-qa.py @@ -237,9 +237,6 @@ def main(): """ 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") parser.add_option('--yes-do-it', dest='yes_do_it', action="store_true", help="Really execute the tests") diff --git a/qa/qa_utils.py b/qa/qa_utils.py index 0ba6cb92d33aa948be505284c7b878bfaaa01637..fbc92e8e7ae3f290a46a8d26abfb0bcf9ee59477 100644 --- a/qa/qa_utils.py +++ b/qa/qa_utils.py @@ -111,13 +111,7 @@ def GetSSHCommand(node, cmd, strict=True): args.append('-oClearAllForwardings=yes') args.append('-oForwardAgent=yes') args.append(node) - - if qa_config.options.dry_run: - prefix = 'exit 0; ' - else: - prefix = '' - - args.append(prefix + cmd) + args.append(cmd) print 'SSH:', utils.ShellQuoteArgs(args)