More hostname handling fixes

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

diff --git a/teuthology/kill.py b/teuthology/kill.py
index c49a3a1e4fa6b9833fbd53e22f9aaa491f5b7247..9751ea207599a2b090fcd446ed3f46076a38878c 100755 (executable)
--- 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 5bc9b3c810c5d084963bcd7ed5ee64bb8b06a470..a8ee6dc54fbe17d357682eb2e390a87c348bdba6 100644 (file)
--- 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)