Remove workaround for keystone

This was required for an ancient keystone version, we can consider
this as solved in H release.

Fixes bug 1174194

Change-Id: Iecee7f3af01cc18ce44d3cf1ecc1b72be8fa765b

openstack_dashboard/api/keystone.py

@@ -117,17 +117,10 @@ def keystoneclient(request, admin=False):
         insecure = getattr(settings, 'OPENSTACK_SSL_NO_VERIFY', False)
         LOG.debug("Creating a new keystoneclient connection to %s." % endpoint)
 
-        # TODO: to be removed in H release
-        kcversion = get_distribution("python-keystoneclient").version
-        if kcversion >= '0.2.0':
-            conn = keystone_client.Client(
-                token=user.token.id, endpoint=endpoint,
-                original_ip=request.environ.get('REMOTE_ADDR', ''),
-                insecure=insecure)
-        else:
-            conn = keystone_client.Client(
-                token=user.token.id, endpoint=endpoint,
-                insecure=insecure)
+        conn = keystone_client.Client(
+            token=user.token.id, endpoint=endpoint,
+            original_ip=request.environ.get('REMOTE_ADDR', ''),
+            insecure=insecure)
         setattr(request, cache_attr, conn)
     return conn
 

tools/pip-requires

@@ -5,7 +5,7 @@ django_openstack_auth>=1.0.7
 netaddr
 python-cinderclient>=1.0.2,<2.0.0
 python-glanceclient<2
-python-keystoneclient
+python-keystoneclient>=0.2,<0.3
 python-novaclient>=2.12.0,<3
 python-quantumclient>=2.2.0,<3.0.0
 python-swiftclient>1.1,<2