From: Zack Cerza <zack@cerza.org>
Date: Thu, 8 May 2014 21:24:57 +0000 (-0500)
Subject: Pass hostname to execute()
X-Git-Tag: v0.94.10~27^2^2~364^2~182
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8567352360278926f9f972aae17f891cdfc88436;p=ceph.git

Pass hostname to execute()

Signed-off-by: Zack Cerza <zack.cerza@inktank.com>
---

diff --git a/teuthology/orchestra/run.py b/teuthology/orchestra/run.py
index 52d6eb975f8..c8ab2c6f96e 100644
--- a/teuthology/orchestra/run.py
+++ b/teuthology/orchestra/run.py
@@ -60,7 +60,7 @@ def quote(args):
     return ' '.join(_quote(args))
 
 
-def execute(client, args):
+def execute(client, args, name=None):
     """
     Execute a command remotely.
 
@@ -68,6 +68,7 @@ def execute(client, args):
 
     :param client: SSHConnection to run the command with
     :param args: command to run
+    :param name: name of client (optional)
     :type args: string or list of strings
 
     Returns a RemoteProcess, where exitstatus is a callable that will
@@ -77,8 +78,13 @@ def execute(client, args):
         cmd = args
     else:
         cmd = quote(args)
-    (host, port) = client.get_transport().getpeername()
-    log.debug('Running [{h}]: {cmd!r}'.format(h=host, cmd=cmd))
+
+    if name:
+        host = name
+    else:
+        (host, port) = client.get_transport().getpeername()
+    log.info('Running [{h}]: {cmd!r}'.format(h=host, cmd=cmd))
+
     (in_, out, err) = client.exec_command(cmd)
 
     def get_exitstatus():
@@ -274,7 +280,12 @@ def run(
     :param wait: Whether to wait for process to exit. If False, returned ``r.exitstatus`` s a `gevent.event.AsyncResult`, and the actual status is available via ``.get()``.
     :param name: Human readable name (probably hostname) of the destination host
     """
-    r = execute(client, args)
+    (host, port) = client.get_transport().getpeername()
+
+    if name is None:
+        name = host
+
+    r = execute(client, args, name=name)
 
     r.stdin = KludgeFile(wrapped=r.stdin)
 
@@ -287,10 +298,6 @@ def run(
 
     if logger is None:
         logger = log
-    (host, port) = client.get_transport().getpeername()
-
-    if name is None:
-        name = host
 
     g_err = None
     if stderr is not PIPE: