Don't override session during auth

Thomas Herve · karelyatin · commit 1008e4e4cbd5 · 2018-02-13T08:12:54.000Z
Looks like we try to override the session even if we don't auth, let's not do that. Change-Id: I520c3d020e3415c5737af7912bddf34931190d65 Closes-Bug: #1748751 (cherry picked from commit f5816f1)
diff --git a/mistralclient/api/v2/client.py b/mistralclient/api/v2/client.py
@@ -59,9 +59,10 @@ def __init__(self, auth_type='keystone', **kwargs):
         else:
             auth_response = {}
 
-        # If the session was None and we're using keystone auth, it will be
-        # created by the auth_handler.
-        session = auth_response.pop('session', None)
+        if session is None:
+            # If the session was None and we're using keystone auth, it will be
+            # created by the auth_handler.
+            session = auth_response.pop('session', None)
 
         req.update(auth_response)
 
