Use Remote.shortname instead of regex

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

diff --git a/teuthology/task/internal.py b/teuthology/task/internal.py
index c5256fd89b324b2ebe63401705298791e11e7f06..6cbf66c03a9da9a79d868851878fb78d184ba97b 100644 (file)
--- a/teuthology/task/internal.py
+++ b/teuthology/task/internal.py
@@ -553,6 +553,7 @@ kern.* -{adir}/syslog/kern.log;RSYSLOG_FileFormat
                 ),
             )
 
+
 def vm_setup(ctx, config):
     """
     Look for virtual machines and handle their initialization
@@ -560,7 +561,7 @@ def vm_setup(ctx, config):
     with parallel() as p:
         editinfo = os.path.join(os.path.dirname(__file__),'edit_sudoers.sh')
         for rem in ctx.cluster.remotes.iterkeys():
-            mname = re.match(".*@([^\.]*)\.?.*", str(rem)).group(1)
+            mname = rem.shortname
             if teuthology.is_vm(mname):
                 r = rem.run(args=['test', '-e', '/ceph-qa-ready',],
                         stdout=StringIO(),