Merge pull request #1990 from kshtsk/wip-downburst-fixes

bunch of downburst fixes
ceph · Aug 8, 2024 · 7ca9115 · 7ca9115
2 parents b5e1bfd + 837a0e1
commit 7ca9115
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/teuthology/misc.py b/teuthology/misc.py
@@ -1127,7 +1127,8 @@ def _ssh_keyscan(hostname):
     for line in p.stdout:
         host, key = line.strip().decode().split(' ', 1)
         keys.append(key)
-    return sorted(keys)[0]
+    if len(keys) > 0:
+        return sorted(keys)[0]
 
 
 def ssh_keyscan_wait(hostname):

diff --git a/teuthology/provision/downburst.py b/teuthology/provision/downburst.py
@@ -44,6 +44,7 @@ def downburst_executable():
 
 def downburst_environment():
     env = dict()
+    env['PATH'] = os.environ.get('PATH')
     discover_url = os.environ.get('DOWNBURST_DISCOVER_URL')
     if config.downburst and not discover_url:
         if isinstance(config.downburst, dict):
@@ -215,7 +216,7 @@ def build_config(self):
             'additional-disks-size': machine['volumes']['size'],
             'arch': 'x86_64',
         }
-        fqdn = self.name.split('@')[1]
+        fqdn = self.name.split('@')[-1]
         file_out = {
             'downburst': file_info,
             'local-hostname': fqdn,