7 files changed, 15 insertions, 14 deletions
diff --git a/keystone/token/backends/kvs.py b/keystone/token/backends/kvs.py
index c3c3e769..171d77df 100644
--- a/keystone/token/backends/kvs.py
+++ b/keystone/token/backends/kvs.py
@@ -17,8 +17,8 @@
 import copy
 
 from keystone.common import kvs
-from keystone.common import logging
 from keystone import exception
+from keystone.openstack.common import log as logging
 from keystone.openstack.common import timeutils
 from keystone import token
 
diff --git a/keystone/token/backends/memcache.py b/keystone/token/backends/memcache.py
index 06e89d60..a07a516b 100644
--- a/keystone/token/backends/memcache.py
+++ b/keystone/token/backends/memcache.py
@@ -19,11 +19,11 @@ import copy
 
 import memcache
 
-from keystone.common import logging
 from keystone.common import utils
 from keystone import config
 from keystone import exception
 from keystone.openstack.common import jsonutils
+from keystone.openstack.common import log as logging
 from keystone.openstack.common import timeutils
 from keystone import token
 
diff --git a/keystone/token/backends/sql.py b/keystone/token/backends/sql.py
index 0e8a916d..82eab651 100644
--- a/keystone/token/backends/sql.py
+++ b/keystone/token/backends/sql.py
@@ -17,7 +17,6 @@
 import copy
 import datetime
 
-
 from keystone.common import sql
 from keystone import exception
 from keystone.openstack.common import timeutils
@@ -30,9 +29,13 @@ class TokenModel(sql.ModelBase, sql.DictBase):
     id = sql.Column(sql.String(64), primary_key=True)
     expires = sql.Column(sql.DateTime(), default=None)
     extra = sql.Column(sql.JsonBlob())
-    valid = sql.Column(sql.Boolean(), default=True)
+    valid = sql.Column(sql.Boolean(), default=True, nullable=False)
     user_id = sql.Column(sql.String(64))
-    trust_id = sql.Column(sql.String(64), nullable=True)
+    trust_id = sql.Column(sql.String(64))
+    __table_args__ = (
+        sql.Index('ix_token_expires', 'expires'),
+        sql.Index('ix_token_valid', 'valid')
+    )
 
 
 class Token(sql.Base, token.Driver):
diff --git a/keystone/token/controllers.py b/keystone/token/controllers.py
index 9ebc29fe..954ff8e8 100644
--- a/keystone/token/controllers.py
+++ b/keystone/token/controllers.py
@@ -3,11 +3,10 @@ import json
 from keystone.common import cms
 from keystone.common import controller
 from keystone.common import dependency
-from keystone.common import logging
-from keystone.common import utils
 from keystone.common import wsgi
 from keystone import config
 from keystone import exception
+from keystone.openstack.common import log as logging
 from keystone.openstack.common import timeutils
 from keystone.token import core
 from keystone.token import provider as token_provider
@@ -215,10 +214,9 @@ class Auth(controller.V2Controller):
                 attribute='password', target='passwordCredentials')
 
         password = auth['passwordCredentials']['password']
-        max_pw_size = utils.MAX_PASSWORD_LENGTH
-        if password and len(password) > max_pw_size:
-            raise exception.ValidationSizeError(attribute='password',
-                                                size=max_pw_size)
+        if password and len(password) > CONF.identity.max_password_length:
+            raise exception.ValidationSizeError(
+                attribute='password', size=CONF.identity.max_password_length)
 
         if ("userId" not in auth['passwordCredentials'] and
                 "username" not in auth['passwordCredentials']):
diff --git a/keystone/token/core.py b/keystone/token/core.py
index bc27b80d..3959586b 100644
--- a/keystone/token/core.py
+++ b/keystone/token/core.py
@@ -21,10 +21,10 @@ import datetime
 
 from keystone.common import cms
 from keystone.common import dependency
-from keystone.common import logging
 from keystone.common import manager
 from keystone import config
 from keystone import exception
+from keystone.openstack.common import log as logging
 from keystone.openstack.common import timeutils
 
 
diff --git a/keystone/token/provider.py b/keystone/token/provider.py
index 2864be6f..f2acb0e1 100644
--- a/keystone/token/provider.py
+++ b/keystone/token/provider.py
@@ -18,10 +18,10 @@
 
 
 from keystone.common import dependency
-from keystone.common import logging
 from keystone.common import manager
 from keystone import config
 from keystone import exception
+from keystone.openstack.common import log as logging
 
 
 CONF = config.CONF
diff --git a/keystone/token/providers/pki.py b/keystone/token/providers/pki.py
index 81abe5d4..64dde473 100644
--- a/keystone/token/providers/pki.py
+++ b/keystone/token/providers/pki.py
@@ -20,9 +20,9 @@ import json
 
 from keystone.common import cms
 from keystone.common import environment
-from keystone.common import logging
 from keystone import config
 from keystone import exception
+from keystone.openstack.common import log as logging
 from keystone.token.providers import uuid