summaryrefslogtreecommitdiffstats
path: root/keystone/catalog
diff options
context:
space:
mode:
Diffstat (limited to 'keystone/catalog')
-rw-r--r--keystone/catalog/backends/templated.py2
-rw-r--r--keystone/catalog/core.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/keystone/catalog/backends/templated.py b/keystone/catalog/backends/templated.py
index a96902d3..7fe73e91 100644
--- a/keystone/catalog/backends/templated.py
+++ b/keystone/catalog/backends/templated.py
@@ -18,8 +18,8 @@ import os.path
from keystone.catalog.backends import kvs
from keystone.catalog import core
-from keystone.common import logging
from keystone import config
+from keystone.openstack.common import log as logging
LOG = logging.getLogger(__name__)
diff --git a/keystone/catalog/core.py b/keystone/catalog/core.py
index b8a081ac..61b7e8ac 100644
--- a/keystone/catalog/core.py
+++ b/keystone/catalog/core.py
@@ -18,10 +18,10 @@
"""Main entry point into the Catalog 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