exec/pexec: substitute $TESTDIR into command

It might be better to make this unescaped, but that's trickier.

Signed-off-by: Sage Weil <sage@inktank.com>

diff --git a/teuthology/task/exec.py b/teuthology/task/exec.py
index 00994e078cd51b694c9f74a97f929f797c933840..4d384fcb6965d6969206439bb27c2ba02c8bd512 100644 (file)
--- a/teuthology/task/exec.py
+++ b/teuthology/task/exec.py
@@ -32,6 +32,7 @@ def task(ctx, config):
         (remote,) = ctx.cluster.only(role).remotes.iterkeys()
         log.info('Running commands on role %s host %s', role, remote.name)
         for c in ls:
+            c.replace('$TESTDIR', testdir)
             remote.run(
                 args=[
                     'sudo',

diff --git a/teuthology/task/pexec.py b/teuthology/task/pexec.py
index 3659907a87bd8ff09803dfba7806ce3ba3d964de..9069ef74fa2d9e37a04f7a84590b27e0bbe983e7 100644 (file)
--- a/teuthology/task/pexec.py
+++ b/teuthology/task/pexec.py
@@ -42,6 +42,7 @@ def _exec_host(barrier, barrier_queue, remote, sudo, testdir, ls):
     r.stdin.writelines(['set -e\n'])
     r.stdin.flush()
     for l in ls:
+        l.replace('$TESTDIR', testdir)
         if l == "barrier":
             _do_barrier(barrier, barrier_queue, remote)
             continue