commit 5203643c2423c89afc90b1c0045de422c643f85a
author Zuul <zuul@review.opendev.org> Mon Mar 21 13:39:42 2022 +0000
committer Gerrit Code Review <review@openstack.org> Mon Mar 21 13:39:42 2022 +0000
tree ea602b7672af886d14497a5ada68162209a99ae9
parent 822cba5b0c834fd6e007137b14c2454c3503ee63
parent 35b2bf14252112b3a60ac58b42eadd60a772ad56

Merge "Fix NoSuchOptError wrt CONF.validation.ssh_key_type"

manila_tempest_tests/common/remote_client.py

diff --git a/manila_tempest_tests/common/remote_client.py b/manila_tempest_tests/common/remote_client.py
index a6eee45..573cdd6 100644
--- a/manila_tempest_tests/common/remote_client.py
+++ b/manila_tempest_tests/common/remote_client.py
@@ -71,8 +71,13 @@
         self.servers_client = servers_client
         self.log_console = CONF.compute_feature_enabled.console_output
         kwargs = {}
-        if CONF.validation.ssh_key_type:
+
+        try:
             kwargs['ssh_key_type'] = CONF.validation.ssh_key_type
+        except Exception:
+            # Not all versions of tempest support the
+            # "validation.ssh_key_type" config option
+            pass
 
         self.ssh_client = ssh.Client(
             ip_address, username, password, pkey=pkey, **kwargs)