teuthology 1.2.0__tar.gz → 1.2.1__tar.gz

{teuthology-1.2.0 → teuthology-1.2.1}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: teuthology
-Version: 1.2.0
+Version: 1.2.1
 Summary: Ceph test framework
 Home-page: https://github.com/ceph/teuthology
-Author: Ceph Community
+Author: Red Hat, Inc.
 License: MIT
 Keywords: teuthology,test,ceph,cluster
 Classifier: Intended Audience :: Developers
@@ -30,7 +30,6 @@ Requires-Dist: backports.ssl-match-hostname
 Requires-Dist: beanstalkc3>=0.4.0
 Requires-Dist: configobj
 Requires-Dist: configparser
-Requires-Dist: cryptography==41.0.7
 Requires-Dist: docopt
 Requires-Dist: gevent
 Requires-Dist: httplib2

{teuthology-1.2.0 → teuthology-1.2.1}/setup.cfg

@@ -3,7 +3,7 @@ name = teuthology
 long_description = file: README.rst
 long_description_content_type = text/x-rst
 url = https://github.com/ceph/teuthology
-author = Ceph Community
+author = Red Hat, Inc.
 license = MIT
 classifiers = 
 	Intended Audience :: Developers
@@ -36,7 +36,6 @@ install_requires =
 	beanstalkc3>=0.4.0
 	configobj
 	configparser
-	cryptography==41.0.7
 	docopt
 	gevent
 	httplib2
@@ -142,8 +141,9 @@ teuthology.task.internal =
 exclude = 
 	teuthology.test
 	teuthology.test.*
+	teuthology.lock.test
+	teuthology.task.tests
 	teuthology.openstack.test
-	teuthology.openstack.test.*
 	teuthology.orchestra.test
 	teuthology.orchestra.test.*
 

{teuthology-1.2.0 → teuthology-1.2.1}/teuthology/orchestra/connection.py

@@ -82,7 +82,7 @@ def connect(user_at_host, host_key=None, keep_alive=False, timeout=60,
     key_filename = key_filename or config.ssh_key
     ssh_config_path = config.ssh_config_path or "~/.ssh/config"
     ssh_config_path = os.path.expanduser(ssh_config_path)
-    if not key_filename and os.path.exists(ssh_config_path):
+    if os.path.exists(ssh_config_path):
         ssh_config = paramiko.SSHConfig()
         ssh_config.parse(open(ssh_config_path))
         opts = ssh_config.lookup(host)
@@ -90,6 +90,8 @@ def connect(user_at_host, host_key=None, keep_alive=False, timeout=60,
             key_filename = opts['identityfile']
         if 'hostname' in opts:
             connect_args['hostname'] = opts['hostname']
+        if 'user' in opts:
+            connect_args['username'] = opts['user']
 
     if key_filename:
         if not isinstance(key_filename, list):

{teuthology-1.2.0 → teuthology-1.2.1}/teuthology/orchestra/daemon/cephadmunit.py

@@ -35,9 +35,9 @@ class CephadmUnit(DaemonState):
 
     def kill_cmd(self, sig):
         return ' '.join([
-            'sudo', 'systemctl', 'kill',
+            'sudo', 'docker', 'kill',
             '-s', str(int(sig)),
-            'ceph-%s@%s.%s' % (self.fsid, self.type_, self.id_),
+            'ceph-%s-%s.%s' % (self.fsid, self.type_, self.id_),
         ])
 
     def _start_logger(self):

{teuthology-1.2.0 → teuthology-1.2.1}/teuthology.egg-info/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: teuthology
-Version: 1.2.0
+Version: 1.2.1
 Summary: Ceph test framework
 Home-page: https://github.com/ceph/teuthology
-Author: Ceph Community
+Author: Red Hat, Inc.
 License: MIT
 Keywords: teuthology,test,ceph,cluster
 Classifier: Intended Audience :: Developers
@@ -30,7 +30,6 @@ Requires-Dist: backports.ssl-match-hostname
 Requires-Dist: beanstalkc3>=0.4.0
 Requires-Dist: configobj
 Requires-Dist: configparser
-Requires-Dist: cryptography==41.0.7
 Requires-Dist: docopt
 Requires-Dist: gevent
 Requires-Dist: httplib2

{teuthology-1.2.0 → teuthology-1.2.1}/teuthology.egg-info/requires.txt

@@ -5,7 +5,6 @@ backports.ssl-match-hostname
 beanstalkc3>=0.4.0
 configobj
 configparser
-cryptography==41.0.7
 docopt
 gevent
 httplib2