summaryrefslogtreecommitdiffstats
path: root/keystone/identity
diff options
context:
space:
mode:
Diffstat (limited to 'keystone/identity')
-rw-r--r--keystone/identity/backends/ldap.py2
-rw-r--r--keystone/identity/controllers.py3
-rw-r--r--keystone/identity/core.py2
3 files changed, 3 insertions, 4 deletions
diff --git a/keystone/identity/backends/ldap.py b/keystone/identity/backends/ldap.py
index a359c63f..ef3b5d61 100644
--- a/keystone/identity/backends/ldap.py
+++ b/keystone/identity/backends/ldap.py
@@ -21,12 +21,12 @@ import ldap
from keystone import clean
from keystone.common import dependency
from keystone.common import ldap as common_ldap
-from keystone.common import logging
from keystone.common import models
from keystone.common import utils
from keystone import config
from keystone import exception
from keystone import identity
+from keystone.openstack.common import log as logging
CONF = config.CONF
diff --git a/keystone/identity/controllers.py b/keystone/identity/controllers.py
index 8777b1f9..67f3beac 100644
--- a/keystone/identity/controllers.py
+++ b/keystone/identity/controllers.py
@@ -22,10 +22,9 @@ import urlparse
import uuid
from keystone.common import controller
-from keystone.common import logging
from keystone import config
from keystone import exception
-
+from keystone.openstack.common import log as logging
CONF = config.CONF
DEFAULT_DOMAIN_ID = CONF.identity.default_domain_id
diff --git a/keystone/identity/core.py b/keystone/identity/core.py
index b2b3eaf0..7fb630e2 100644
--- a/keystone/identity/core.py
+++ b/keystone/identity/core.py
@@ -18,10 +18,10 @@
from keystone import clean
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