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 5c34433d91af030c3ae353331cd71d4ebebdca23..a5b913381fbf24498707c4bb212068c160e70a48 100644 (file)
--- 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'
                     ])