From: Zack Cerza <zack@redhat.com>
Date: Fri, 14 Jan 2022 20:21:34 +0000 (-0700)
Subject: lock_many: Include username in target keys
X-Git-Tag: 1.2.0~190^2~41
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=723063a25e7e943be4fcf05b4c7ff181fa321f0e;p=teuthology.git

lock_many: Include username in target keys

So that we can actually support different usernames per node.

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

diff --git a/teuthology/lock/ops.py b/teuthology/lock/ops.py
index 853879a6a..b0c7d8033 100644
--- a/teuthology/lock/ops.py
+++ b/teuthology/lock/ops.py
@@ -116,8 +116,13 @@ def lock_many(ctx, num, machine_type, user=None, description=None,
             headers={'content-type': 'application/json'},
         )
         if response.ok:
-            machines = {misc.canonicalize_hostname(machine['name']):
-                        machine['ssh_pub_key'] for machine in response.json()}
+            machines = dict()
+            for machine in response.json():
+                key = misc.canonicalize_hostname(
+                    machine['name'],
+                    user=machine.get('user'),
+                )
+                machines[key] = machine['ssh_pub_key']
             log.debug('locked {machines}'.format(
                 machines=', '.join(machines.keys())))
             if machine_type in vm_types: