Adds option to have per-remote port

diff --git a/teuthology/orchestra/remote.py b/teuthology/orchestra/remote.py
index af6e1ee9795de988973fc81a74cc34b86e718a03..fb215df8b195c15d92e6ba5301a2355575d1f09d 100644 (file)
--- a/teuthology/orchestra/remote.py
+++ b/teuthology/orchestra/remote.py
@@ -35,7 +35,7 @@ class Remote(object):
     _runner = staticmethod(run.run)
 
     def __init__(self, name, ssh=None, shortname=None, console=None,
-                 host_key=None, keep_alive=True, ssh_port=22):
+                 host_key=None, keep_alive=True, port=22):
         self.name = name
         if '@' in name:
             (self.user, hostname) = name.split('@')
@@ -52,7 +52,7 @@ class Remote(object):
         self.keep_alive = keep_alive
         self.console = console
         self.ssh = ssh
-        self.ssh_port = ssh_port
+        self.ssh_port = port
 
     def connect(self, timeout=None):
         args = dict(user_at_host=self.name, host_key=self._host_key,

diff --git a/teuthology/task/internal.py b/teuthology/task/internal.py
index 6bdc77dedd7b9d13a37b955f1df281129d94480a..1981810be340c9bb6efc57bf433c04e3c0b6433d 100644 (file)
--- a/teuthology/task/internal.py
+++ b/teuthology/task/internal.py
@@ -296,18 +296,20 @@ def add_remotes(ctx, config):
     """
     remotes = []
     machs = []
-    ssh_port = ctx.config.get('ssh_port', 22)
     for name in ctx.config['targets'].iterkeys():
         machs.append(name)
     for t, key in ctx.config['targets'].iteritems():
+        port = 22
+        if ':' in t:
+            port = int(t.split(':')[1])
+            t = t.split(':')[0]
         t = misc.canonicalize_hostname(t)
         try:
             if ctx.config['sshkeys'] == 'ignore':
                 key = None
         except (AttributeError, KeyError):
             pass
-        rem = remote.Remote(name=t, host_key=key,
-                            keep_alive=True, ssh_port=ssh_port)
+        rem = remote.Remote(name=t, host_key=key, keep_alive=True, port=port)
         remotes.append(rem)
     ctx.cluster = cluster.Cluster()
     if 'roles' in ctx.config: