Use timeout argument for all paramiko timeout options

SUSE-Enceladus · Jan 24, 2024 · 2d4fffc · 2d4fffc
1 parent e27c743
commit 2d4fffc
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/lib/ec2imgutils/ec2uploadimg.py b/lib/ec2imgutils/ec2uploadimg.py
@@ -604,7 +604,9 @@ def _establish_ssh_connection(self):
                     key_filename=self.ssh_key_private_key_file,
                     username=self.inst_user_name,
                     hostname=instance_ip,
-                    timeout=10
+                    timeout=self.ssh_timeout,
+                    banner_timeout=self.ssh_timeout,
+                    auth_timeout=self.ssh_timeout
                 )
             except (Exception, ConnectionResetError):
                 if self.log_level == logging.DEBUG:

diff --git a/python3-ec2imgutils.spec b/python3-ec2imgutils.spec
@@ -29,7 +29,7 @@ Source0:        %{upstream_name}-%{version}.tar.bz2
 Requires:       python3
 Requires:       python3-boto3 >= 1.29.84
 Requires:       python3-dateutil
-Requires:       python3-paramiko
+Requires:       python3-paramiko >= 2.2.0
 BuildRequires:  python3-boto3 >= 1.29.84
 BuildRequires:  python3-dateutil
 BuildRequires:  python3-setuptools
@@ -87,5 +87,3 @@ gzip %{buildroot}/%{_mandir}/man1/*
 %{_bindir}/*
 
 %changelog
-
-
diff --git a/requirements.txt b/requirements.txt
@@ -1,3 +1,3 @@
 boto3>=1.4.1
-paramiko
+paramiko>=2.2.0
 python-dateutil