From: Sandon Van Ness <sandon@inktank.com>
Date: Tue, 9 Apr 2013 20:12:58 +0000 (-0700)
Subject: Fix for kdb: doesn't work on mira nodes
X-Git-Tag: 1.1.0~2195
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=e2938f402606e86f19d64647982d1bebae00428a;p=teuthology.git

Fix for kdb: doesn't work on mira nodes

This is a fix for issue #4677 which was caused by kdb output being
hard-coded to ttyS1 which is fine for all our hardware except mira
machines. This change just checks to see if mira is in the host's
name and uses ttyS2 instead (simple fix).
---

diff --git a/teuthology/task/kernel.py b/teuthology/task/kernel.py
index 5c34433d91..a5b913381f 100644
--- a/teuthology/task/kernel.py
+++ b/teuthology/task/kernel.py
@@ -287,11 +287,15 @@ def install_and_reboot(ctx, config):
 def enable_disable_kdb(ctx, config):
     for role, enable in config.iteritems():
         (role_remote,) = ctx.cluster.only(role).remotes.keys()
+        if "mira" in role_remote.name:
+            serialdev = "ttyS2"
+        else:
+            serialdev = "ttyS1"
         if enable:
             log.info('Enabling kdb on {role}...'.format(role=role))
             role_remote.run(
                 args=[
-                    'echo', 'ttyS1',
+                    'echo', serialdev,
                     run.Raw('|'),
                     'sudo', 'tee', '/sys/module/kgdboc/parameters/kgdboc'
                     ])