From b1a9ac177197067a189d1a2d124b84fdbf88d765 Mon Sep 17 00:00:00 2001 From: Zack Cerza Date: Tue, 26 Aug 2014 10:33:17 -0600 Subject: [PATCH] Less dangerous hostname mangling Signed-off-by: Zack Cerza --- teuthology/lock.py | 4 ++-- teuthology/task/internal.py | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/teuthology/lock.py b/teuthology/lock.py index 226e667dbe..d0192efcf7 100644 --- a/teuthology/lock.py +++ b/teuthology/lock.py @@ -186,8 +186,8 @@ def main(ctx): machines_to_update = result.keys() if ctx.machine_type == 'vps': shortnames = ' '.join( - [name.split('@')[1].split('.')[0] - for name in result.keys()] + [misc.decanonicalize_hostname(name) for name in + result.keys()] ) if len(result) < ctx.num_to_lock: log.error("Locking failed.") diff --git a/teuthology/task/internal.py b/teuthology/task/internal.py index 87991579db..bda6df8bbc 100644 --- a/teuthology/task/internal.py +++ b/teuthology/task/internal.py @@ -117,8 +117,9 @@ def lock_machines(ctx, config): for guest in vmlist: if guest not in keys_dict.keys(): log.info('recreating: ' + guest) - provision.destroy_if_vm(ctx, 'ubuntu@' + guest) - provision.create_if_vm(ctx, 'ubuntu@' + guest) + full_name = misc.canonicalize_hostname(guest) + provision.destroy_if_vm(ctx, full_name) + provision.create_if_vm(ctx, full_name) if lock.do_update_keys(keys_dict): log.info("Error in virtual machine keys") newscandict = {} -- 2.39.5