3 files changed, 6 insertions, 6 deletions
diff --git a/keystone/trust/backends/sql.py b/keystone/trust/backends/sql.py
index daa8e3f7..9e92ad71 100644
--- a/keystone/trust/backends/sql.py
+++ b/keystone/trust/backends/sql.py
@@ -26,11 +26,11 @@ class TrustModel(sql.ModelBase, sql.DictBase):
                   'project_id', 'impersonation', 'expires_at']
     id = sql.Column(sql.String(64), primary_key=True)
     #user id Of owner
-    trustor_user_id = sql.Column(sql.String(64), unique=False, nullable=False,)
+    trustor_user_id = sql.Column(sql.String(64), nullable=False,)
     #user_id of user allowed to consume this preauth
-    trustee_user_id = sql.Column(sql.String(64), unique=False, nullable=False)
-    project_id = sql.Column(sql.String(64), unique=False, nullable=True)
-    impersonation = sql.Column(sql.Boolean)
+    trustee_user_id = sql.Column(sql.String(64), nullable=False)
+    project_id = sql.Column(sql.String(64))
+    impersonation = sql.Column(sql.Boolean, nullable=False)
     deleted_at = sql.Column(sql.DateTime)
     expires_at = sql.Column(sql.DateTime)
     extra = sql.Column(sql.JsonBlob())
diff --git a/keystone/trust/controllers.py b/keystone/trust/controllers.py
index 7a94fe29..3d8df459 100644
--- a/keystone/trust/controllers.py
+++ b/keystone/trust/controllers.py
@@ -2,10 +2,10 @@ import uuid
 
 from keystone.common import controller
 from keystone.common import dependency
-from keystone.common import logging
 from keystone import config
 from keystone import exception
 from keystone import identity
+from keystone.openstack.common import log as logging
 from keystone.openstack.common import timeutils
 
 
diff --git a/keystone/trust/core.py b/keystone/trust/core.py
index 5c4fc90f..e4ff74de 100644
--- a/keystone/trust/core.py
+++ b/keystone/trust/core.py
@@ -17,10 +17,10 @@
 """Main entry point into the Identity service."""
 
 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