Catch ConnectFailure

gnuoy · Oct 25, 2023 · d98638f · d98638f
1 parent 8f9eff8
commit d98638f
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/zaza/openstack/charm_tests/keystone/tests_ldap_k8s.py b/zaza/openstack/charm_tests/keystone/tests_ldap_k8s.py
@@ -16,6 +16,7 @@
 import json
 import tenacity
 import contextlib
+from keystoneauth1.exceptions.connection import ConnectFailure
 from keystoneauth1.exceptions.http import NotFound as http_NotFound
 import logging
 from requests.exceptions import ConnectionError
@@ -118,7 +119,8 @@ def _find_keystone_v3_group(self, group, domain):
         logging.info('Looking for group: {}'.format(group))
         try:
             return super()._find_keystone_v3_group(group, domain)
-        except (AttributeError, http_NotFound, ConnectionError):
+        except (AttributeError, http_NotFound, ConnectionError,
+                ConnectFailure):
             raise KeystoneLookupError
 
     @tenacity.retry(wait=tenacity.wait_exponential(multiplier=2, max=60),
@@ -132,7 +134,8 @@ def _find_keystone_v3_user(self, username, domain, group=None):
                 username,
                 domain,
                 group=group)
-        except (AttributeError, http_NotFound, ConnectionError):
+        except (AttributeError, http_NotFound, ConnectionError,
+                ConnectFailure):
             raise KeystoneLookupError