Merge pull request #36 from ceph/wip-ed25519-pubkey

consider ed25519 pubkey

downburst/meta.py

@@ -5,12 +5,12 @@
 log = logging.getLogger(__name__)
 
 def get_ssh_pubkey():
-    path = os.path.expanduser('~/.ssh/id_rsa.pub')
-    if not os.path.exists(path):
+    for p in ('~/.ssh/id_rsa.pub', '~/.ssh/id_ed25519.pub'):
+        path = os.path.expanduser(p)
+        if os.path.exists(path):
+            with open(path, 'rt') as f:
+                return f.readline().rstrip('\n')
         log.warn("Public key not found, skipping it: " + path)
-        return
-    with open(path, 'rt') as f:
-        return f.readline().rstrip('\n')
 
 
 KEYURL='https://git.ceph.com/?p=keys.git;a=blob_plain;f=ssh/teuthology-ubuntu.pub;hb=HEAD'

downburst/template.xml

@@ -3,7 +3,7 @@
   <memory>524288</memory>
   <vcpu>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-1.0'>hvm</type>
+    <type arch='x86_64'>hvm</type>
     <boot dev='hd'/>
   </os>
   <features>

setup.py

@@ -44,7 +44,9 @@
         "License :: OSI Approved :: MIT License",
         "Natural Language :: English",
         "Operating System :: POSIX :: Linux",
-        "Programming Language :: Python :: 2.7",
+        "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
+        "Programming Language :: Python :: 3.12",
     ],
 
     install_requires=install_requires,