Merge "exception is not handled in the exception."

Juniper · Mar 9, 2016 · 5fb639f · 5fb639f
2 parents 5a8b05a + 6c75f15
commit 5fb639f
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