Adapter version is a tuple

The docstring for Adapter says that the version is a tuple like
(3,0), but the HttpClient was passing a string like "v3".

Closes-Bug: 1450272
Change-Id: I74b009d68f5601bda3ae92b3c8de1ecef00d8316

1 files changed, 5 insertions, 1 deletions

diff --git a/keystoneclient/httpclient.py b/keystoneclient/httpclient.py
index 3270295..317a9e8 100644
--- a/keystoneclient/httpclient.py
+++ b/keystoneclient/httpclient.py
@@ -51,6 +51,7 @@ if not hasattr(urlparse, 'parse_qsl'):
     urlparse.parse_qsl = cgi.parse_qsl
 
 
+from keystoneclient import _discover
 from keystoneclient import access
 from keystoneclient import adapter
 from keystoneclient.auth import base
@@ -323,13 +324,16 @@ class HTTPClient(baseclient.Client, base.BaseAuthPlugin):
         # NOTE(jamielennox): unfortunately we can't just use **kwargs here as
         # it would incompatibly limit the kwargs that can be passed to __init__
         # try and keep this list in sync with adapter.Adapter.__init__
+        version = (
+            _discover.normalize_version_number(self.version) if self.version
+            else None)
         self._adapter = _KeystoneAdapter(session,
                                          service_type='identity',
                                          service_name=service_name,
                                          interface=interface,
                                          region_name=region_name,
                                          endpoint_override=endpoint_override,
-                                         version=self.version,
+                                         version=version,
                                          auth=auth,
                                          user_agent=user_agent,
                                          connect_retries=connect_retries)