From 85f59455093f5ba22f2164f4e617405446ec0a2f Mon Sep 17 00:00:00 2001 From: Zack Cerza Date: Mon, 25 Aug 2014 15:08:11 -0600 Subject: [PATCH] More hostname handling fixes Signed-off-by: Zack Cerza --- teuthology/kill.py | 3 ++- teuthology/lock.py | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/teuthology/kill.py b/teuthology/kill.py index c49a3a1e4f..9751ea2075 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 5bc9b3c810..a8ee6dc54f 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) -- 2.39.5