From 7783767f23494b549b74cc2843631c8aed456866 Mon Sep 17 00:00:00 2001
From: Robert Myers <robert.myers@rackspace.com>
Date: Mon, 13 Oct 2014 13:03:15 -0500
Subject: [PATCH] Don't use sessions if third party plugin is used

If an auth_plugin is used do not try to load the session
from the default keystone providers.

Change-Id: If2a87e23cabde006833de70e5c7aa066d95dbf50
Closes-Bug: #1380729
---
 cinderclient/client.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cinderclient/client.py b/cinderclient/client.py
index 8ed1be80c..6ea01d3d6 100644
--- a/cinderclient/client.py
+++ b/cinderclient/client.py
@@ -479,7 +479,8 @@ def _construct_http_client(username=None, password=None, project_id=None,
                            auth=None,
                            **kwargs):
 
-    if session:
+    # Don't use sessions if third party plugin is used
+    if session and not auth_plugin:
         kwargs.setdefault('user_agent', 'python-cinderclient')
         kwargs.setdefault('interface', endpoint_type)
         return SessionClient(session=session,