Merge "exception is not handled in the exception." into R3.0

Juniper · Feb 29, 2016 · 0731fac · 0731fac
2 parents f4461a7 + 0a6d65c
commit 0731fac
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/discovery/disc_auth_keystone.py b/src/discovery/disc_auth_keystone.py
@@ -8,7 +8,10 @@
 try:
     from keystoneclient.middleware import auth_token
 except ImportError:
-    from keystonemiddleware import auth_token
+    try:
+        from keystonemiddleware import auth_token
+    except Exception:
+        pass
 except Exception:
     pass