From: Zack Cerza <zack.cerza@inktank.com>
Date: Mon, 25 Aug 2014 21:08:11 +0000 (-0600)
Subject: More hostname handling fixes
X-Git-Tag: 1.1.0~1212
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=85f59455093f5ba22f2164f4e617405446ec0a2f;p=teuthology.git

More hostname handling fixes

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

diff --git a/teuthology/kill.py b/teuthology/kill.py
index c49a3a1e4..9751ea207 100755
--- a/teuthology/kill.py
+++ b/teuthology/kill.py
@@ -11,6 +11,7 @@ import getpass
 from . import beanstalk
 from . import report
 from .config import config
+from . import misc
 
 log = logging.getLogger(__name__)
 
@@ -205,7 +206,7 @@ def nuke_targets(targets_dict, owner):
 
     to_nuke = []
     for target in targets:
-        to_nuke.append(target.split('@')[1].split('.')[0])
+        to_nuke.append(misc.decanonicalize_hostname(target))
 
     target_file = tempfile.NamedTemporaryFile(delete=False)
     target_file.write(yaml.safe_dump(targets_dict))
diff --git a/teuthology/lock.py b/teuthology/lock.py
index 5bc9b3c81..a8ee6dc54 100644
--- a/teuthology/lock.py
+++ b/teuthology/lock.py
@@ -75,6 +75,7 @@ def main(ctx):
         if machines:
             statuses = []
             for machine in machines:
+                machine = misc.canonicalize_hostname(machine)
                 status = get_status(machine)
                 if status:
                     statuses.append(status)