Use Remote.user

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

diff --git a/teuthology/orchestra/remote.py b/teuthology/orchestra/remote.py
index 9d832effe3fdf942f0d765765617effd80012f65..bde222dd33f2115d941fd7de1731484158265434 100644 (file)
--- a/teuthology/orchestra/remote.py
+++ b/teuthology/orchestra/remote.py
@@ -35,7 +35,7 @@ class Remote(object):
     def __init__(self, name, ssh=None, shortname=None, console=None,
                  host_key=None, keep_alive=True):
         self.name = name
-        (self.user, self.hostname) = name.split('@')[-1]
+        (self.user, self.hostname) = name.split('@')
         self._shortname = shortname
         self.host_key = host_key
         self.keep_alive = keep_alive

diff --git a/teuthology/task/workunit.py b/teuthology/task/workunit.py
index b504eeb50c58d4a1273eeec6a101532139cace88..1c88337230d0cd561aec3a3e158d93d4023bc074 100644 (file)
--- a/teuthology/task/workunit.py
+++ b/teuthology/task/workunit.py
@@ -170,7 +170,7 @@ def _make_scratch_dir(ctx, role, subdir):
     id_ = role[len(PREFIX):]
     log.debug("getting remote for {id} role {role_}".format(id=id_, role_=role))
     (remote,) = ctx.cluster.only(role).remotes.iterkeys()
-    dir_owner = remote.shortname.split('@', 1)[0]
+    dir_owner = remote.user
     mnt = os.path.join(teuthology.get_testdir(ctx), 'mnt.{id}'.format(id=id_))
     # if neither kclient nor ceph-fuse are required for a workunit,
     # mnt may not exist. Stat and create the directory if it doesn't.