Use oslo.log instead of incubator

Most of changes are just replacing

from keystone.openstack.common import log
  with
from oslo_log import log

There are some other specific changes that had to be made
  * Initialize logger in keystone/config.py

Change-Id: I859edb71c434051ffe7f34c16018b738ddb71e3b

HACKING.rst

@@ -25,7 +25,7 @@ Logging
 
 Use the common logging module, and ensure you ``getLogger``::
 
-    from keystone.openstack.common import log
+    from oslo_log import log
 
     LOG = log.getLogger(__name__)
 

config-generator/keystone.conf

@@ -4,8 +4,8 @@ wrap_width = 79
 namespace = keystone
 namespace = keystone.notifications
 namespace = keystone.openstack.common.eventlet_backdoor
-namespace = keystone.openstack.common.log
 namespace = keystone.openstack.common.policy
+namespace = oslo.log
 namespace = oslo.messaging
 namespace = oslo.db
 namespace = oslo.middleware

keystone/assignment/backends/ldap.py

@@ -15,6 +15,7 @@ from __future__ import absolute_import
 
 import ldap as ldap
 import ldap.filter
+from oslo_log import log
 
 from keystone import assignment
 from keystone.assignment.role_backends import ldap as ldap_role
@@ -24,7 +25,6 @@ from keystone import config
 from keystone import exception
 from keystone.i18n import _
 from keystone.identity.backends import ldap as ldap_identity
-from keystone.openstack.common import log
 from keystone.openstack.common import versionutils
 
 

keystone/assignment/backends/sql.py

@@ -12,6 +12,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from oslo_log import log
 import six
 import sqlalchemy
 from sqlalchemy.sql.expression import false
@@ -21,7 +22,6 @@ from keystone.common import sql
 from keystone import config
 from keystone import exception
 from keystone.i18n import _
-from keystone.openstack.common import log
 
 
 CONF = config.CONF

keystone/assignment/controllers.py

@@ -19,6 +19,7 @@ import copy
 import functools
 import uuid
 
+from oslo_log import log
 from six.moves import urllib
 
 from keystone.assignment import schema
@@ -29,7 +30,6 @@ from keystone import config
 from keystone import exception
 from keystone.i18n import _, _LW
 from keystone.models import token_model
-from keystone.openstack.common import log
 
 
 CONF = config.CONF

keystone/assignment/core.py

@@ -16,6 +16,7 @@
 
 import abc
 
+from oslo_log import log
 import six
 
 from keystone.common import cache
@@ -27,7 +28,6 @@ from keystone import exception
 from keystone.i18n import _
 from keystone.i18n import _LI
 from keystone import notifications
-from keystone.openstack.common import log
 from keystone.openstack.common import versionutils
 
 

keystone/assignment/role_backends/ldap.py

@@ -12,6 +12,8 @@
 
 from __future__ import absolute_import
 
+from oslo_log import log
+
 from keystone import assignment
 from keystone.common import ldap as common_ldap
 from keystone.common import models
@@ -19,7 +21,6 @@ from keystone import config
 from keystone import exception
 from keystone.i18n import _
 from keystone.identity.backends import ldap as ldap_identity
-from keystone.openstack.common import log
 
 
 CONF = config.CONF

keystone/auth/controllers.py

@@ -15,6 +15,7 @@
 import sys
 
 from keystoneclient.common import cms
+from oslo_log import log
 from oslo_serialization import jsonutils
 from oslo_utils import importutils
 from oslo_utils import timeutils
@@ -27,7 +28,6 @@ from keystone import config
 from keystone.contrib import federation
 from keystone import exception
 from keystone.i18n import _, _LI, _LW
-from keystone.openstack.common import log
 from keystone.resource import controllers as resource_controllers
 
 

keystone/auth/plugins/mapped.py

@@ -12,6 +12,7 @@
 
 import functools
 
+from oslo_log import log
 from oslo_serialization import jsonutils
 from pycadf import cadftaxonomy as taxonomy
 from six.moves.urllib import parse
@@ -24,7 +25,6 @@ from keystone import exception
 from keystone.i18n import _
 from keystone.models import token_model
 from keystone import notifications
-from keystone.openstack.common import log
 
 
 LOG = log.getLogger(__name__)

keystone/auth/plugins/oauth1.py

@@ -12,6 +12,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from oslo_log import log
 from oslo_utils import timeutils
 
 from keystone import auth
@@ -21,7 +22,6 @@ from keystone.contrib.oauth1 import core as oauth
 from keystone.contrib.oauth1 import validator
 from keystone import exception
 from keystone.i18n import _
-from keystone.openstack.common import log
 
 
 LOG = log.getLogger(__name__)

keystone/auth/plugins/password.py

@@ -14,13 +14,13 @@
 
 import sys
 
+from oslo_log import log
 import six
 
 from keystone import auth
 from keystone.common import dependency
 from keystone import exception
 from keystone.i18n import _
-from keystone.openstack.common import log
 
 METHOD_NAME = 'password'
 

keystone/auth/plugins/token.py

@@ -12,6 +12,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from oslo_log import log
 import six
 
 from keystone import auth
@@ -22,7 +23,6 @@ from keystone import config
 from keystone import exception
 from keystone.i18n import _
 from keystone.models import token_model
-from keystone.openstack.common import log
 
 
 LOG = log.getLogger(__name__)

keystone/catalog/backends/templated.py

@@ -14,6 +14,7 @@
 
 import os.path
 
+from oslo_log import log
 import six
 
 from keystone.catalog.backends import kvs
@@ -21,7 +22,6 @@ from keystone.catalog import core
 from keystone import config
 from keystone import exception
 from keystone.i18n import _LC
-from keystone.openstack.common import log
 
 
 LOG = log.getLogger(__name__)

keystone/catalog/core.py

@@ -17,6 +17,7 @@
 
 import abc
 
+from oslo_log import log
 import six
 
 from keystone.common import cache
@@ -29,7 +30,6 @@ from keystone import exception
 from keystone.i18n import _
 from keystone.i18n import _LE
 from keystone import notifications
-from keystone.openstack.common import log
 
 
 CONF = config.CONF

keystone/cli.py

@@ -17,6 +17,7 @@ from __future__ import absolute_import
 import os
 
 from oslo_config import cfg
+from oslo_log import log
 import pbr.version
 
 from keystone import assignment
@@ -27,13 +28,11 @@ from keystone.common import utils
 from keystone import config
 from keystone.i18n import _, _LW
 from keystone import identity
-from keystone.openstack.common import log
 from keystone import token
 
 
-LOG = log.getLogger(__name__)
-
 CONF = config.CONF
+LOG = log.getLogger(__name__)
 
 
 class BaseApp(object):

keystone/common/authorization.py

@@ -16,10 +16,11 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo_log import log
+
 from keystone import exception
 from keystone.i18n import _, _LW
 from keystone.models import token_model
-from keystone.openstack.common import log
 
 
 AUTH_CONTEXT_ENV = 'KEYSTONE_AUTH_CONTEXT'

keystone/common/cache/_memcache_pool.py

@@ -26,11 +26,11 @@ import threading
 import time
 
 import memcache
+from oslo_log import log
 from six.moves import queue
 
 from keystone import exception
 from keystone.i18n import _
-from keystone.openstack.common import log
 
 
 LOG = log.getLogger(__name__)

keystone/common/cache/backends/mongo.py

@@ -17,13 +17,13 @@ import datetime
 
 from dogpile.cache import api
 from dogpile.cache import util as dp_util
+from oslo_log import log
 from oslo_utils import importutils
 from oslo_utils import timeutils
 import six
 
 from keystone import exception
 from keystone.i18n import _, _LW
-from keystone.openstack.common import log
 
 
 NO_VALUE = api.NO_VALUE

keystone/common/cache/core.py

@@ -17,12 +17,12 @@
 import dogpile.cache
 from dogpile.cache import proxy
 from dogpile.cache import util
+from oslo_log import log
 from oslo_utils import importutils
 
 from keystone import config
 from keystone import exception
 from keystone.i18n import _, _LE
-from keystone.openstack.common import log
 
 
 CONF = config.CONF

keystone/common/controller.py

@@ -15,6 +15,7 @@
 import functools
 import uuid
 
+from oslo_log import log
 import six
 
 from keystone.common import authorization
@@ -26,7 +27,6 @@ from keystone import config
 from keystone import exception
 from keystone.i18n import _, _LW
 from keystone.models import token_model
-from keystone.openstack.common import log
 
 
 LOG = log.getLogger(__name__)

keystone/common/environment/__init__.py

@@ -15,7 +15,7 @@
 import functools
 import os
 
-from keystone.openstack.common import log
+from oslo_log import log
 
 LOG = log.getLogger(__name__)
 

keystone/common/environment/eventlet_server.py

@@ -25,15 +25,16 @@ import sys
 import eventlet
 import eventlet.wsgi
 import greenlet
+from oslo_log import log
+from oslo_log import loggers
 
 from keystone.i18n import _LE, _LI
-from keystone.openstack.common import log
 
 
 LOG = log.getLogger(__name__)
 
 
-class EventletFilteringLogger(log.WritableLogger):
+class EventletFilteringLogger(loggers.WritableLogger):
     # NOTE(morganfainberg): This logger is designed to filter out specific
     # Tracebacks to limit the amount of data that eventlet can log. In the
     # case of broken sockets (EPIPE and ECONNRESET), we are seeing a huge

keystone/common/kvs/backends/memcached.py

@@ -21,13 +21,13 @@ import time
 
 from dogpile.cache import api
 from dogpile.cache.backends import memcached
+from oslo_log import log
 
 from keystone.common.cache.backends import memcache_pool
 from keystone.common import manager
 from keystone import config
 from keystone import exception
 from keystone.i18n import _
-from keystone.openstack.common import log
 
 
 CONF = config.CONF

keystone/common/kvs/core.py

@@ -22,6 +22,7 @@ from dogpile.cache import proxy
 from dogpile.cache import region
 from dogpile.cache import util as dogpile_util
 from dogpile.core import nameregistry
+from oslo_log import log
 from oslo_utils import importutils
 import six
 
@@ -30,7 +31,6 @@ from keystone import exception
 from keystone.i18n import _
 from keystone.i18n import _LI
 from keystone.i18n import _LW
-from keystone.openstack.common import log
 
 
 __all__ = ['KeyValueStore', 'KeyValueStoreLock', 'LockTimeout',

keystone/common/ldap/core.py

@@ -22,12 +22,12 @@ import weakref
 
 import ldap.filter
 import ldappool
+from oslo_log import log
 import six
 
 from keystone import exception
 from keystone.i18n import _
 from keystone.i18n import _LW
-from keystone.openstack.common import log
 
 LOG = log.getLogger(__name__)
 

keystone/common/openssl.py

@@ -15,11 +15,12 @@
 
 import os
 
+from oslo_log import log
+
 from keystone.common import environment
 from keystone.common import utils
 from keystone import config
 from keystone.i18n import _LI, _LE
-from keystone.openstack.common import log
 
 LOG = log.getLogger(__name__)
 CONF = config.CONF

keystone/common/sql/core.py

@@ -26,6 +26,7 @@ from oslo_db import exception as db_exception
 from oslo_db import options as db_options
 from oslo_db.sqlalchemy import models
 from oslo_db.sqlalchemy import session as db_session
+from oslo_log import log
 from oslo_serialization import jsonutils
 import six
 import sqlalchemy as sql
@@ -36,7 +37,6 @@ from sqlalchemy import types as sql_types
 from keystone.common import utils
 from keystone import exception
 from keystone.i18n import _
-from keystone.openstack.common import log
 
 
 CONF = cfg.CONF

keystone/common/sql/migrate_repo/versions/034_havana.py

@@ -11,13 +11,13 @@
 #    under the License.
 
 import migrate
+from oslo_log import log
 import sqlalchemy as sql
 from sqlalchemy import orm
 
 from keystone.common import sql as ks_sql
 from keystone.common.sql import migration_helpers
 from keystone import config
-from keystone.openstack.common import log
 
 
 LOG = log.getLogger(__name__)

keystone/common/utils.py

@@ -23,6 +23,7 @@ import hashlib
 import os
 import pwd
 
+from oslo_log import log
 from oslo_serialization import jsonutils
 from oslo_utils import strutils
 import passlib.hash
@@ -32,7 +33,6 @@ from six import moves
 from keystone.common import config
 from keystone import exception
 from keystone.i18n import _, _LE, _LW
-from keystone.openstack.common import log
 
 
 CONF = config.CONF

keystone/common/wsgi.py

@@ -22,6 +22,7 @@ import copy
 import urllib
 
 import oslo_i18n
+from oslo_log import log
 from oslo_serialization import jsonutils
 from oslo_utils import importutils
 from oslo_utils import strutils
@@ -38,7 +39,6 @@ from keystone.i18n import _
 from keystone.i18n import _LI
 from keystone.i18n import _LW
 from keystone.models import token_model
-from keystone.openstack.common import log
 
 
 CONF = config.CONF

keystone/config.py

@@ -16,9 +16,10 @@
 import logging
 import os
 
+from oslo_log import log
+
 from keystone.common import config
 from keystone import exception
-from keystone.openstack.common import log
 
 
 CONF = config.CONF
@@ -44,18 +45,13 @@ def set_default_for_default_log_levels():
         'keystone.common._memcache_pool=INFO',
     ]
 
-    def find_default_log_levels_opt():
-        for opt in log.log_opts:
-            if opt.dest == 'default_log_levels':
-                return opt
-
-    opt = find_default_log_levels_opt()
-    opt.default.extend(extra_log_level_defaults)
+    log.register_options(CONF)
+    CONF.default_log_levels.extend(extra_log_level_defaults)
 
 
 def setup_logging():
     """Sets up logging for the keystone package."""
-    log.setup('keystone')
+    log.setup(CONF, 'keystone')
     logging.captureWarnings(True)
 
 

keystone/contrib/endpoint_filter/core.py

@@ -14,6 +14,7 @@
 
 import abc
 
+from oslo_log import log
 import six
 
 from keystone.common import dependency
@@ -21,7 +22,6 @@ from keystone.common import extension
 from keystone.common import manager
 from keystone import config
 from keystone import exception
-from keystone.openstack.common import log
 
 
 CONF = config.CONF

keystone/contrib/endpoint_policy/core.py

@@ -14,6 +14,7 @@
 
 import abc
 
+from oslo_log import log
 import six
 
 from keystone.common import dependency
@@ -21,7 +22,6 @@ from keystone.common import manager
 from keystone import config
 from keystone import exception
 from keystone.i18n import _, _LE, _LW
-from keystone.openstack.common import log
 
 CONF = config.CONF
 LOG = log.getLogger(__name__)

keystone/contrib/example/core.py

@@ -12,13 +12,13 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from oslo_log import log
 
 from keystone.common import dependency
 from keystone.common import manager
 from keystone import exception
 from keystone.i18n import _LI
 from keystone import notifications
-from keystone.openstack.common import log
 
 
 LOG = log.getLogger(__name__)

keystone/contrib/federation/core.py

@@ -14,6 +14,7 @@
 
 import abc
 
+from oslo_log import log as logging
 import six
 
 from keystone.common import dependency
@@ -21,7 +22,6 @@ from keystone.common import extension
 from keystone.common import manager
 from keystone import config
 from keystone import exception
-from keystone.openstack.common import log as logging
 
 
 CONF = config.CONF

keystone/contrib/federation/idp.py

@@ -15,6 +15,7 @@ import os
 import subprocess
 import uuid
 
+from oslo_log import log
 from oslo_utils import timeutils
 import saml2
 from saml2 import md
@@ -27,7 +28,6 @@ from keystone.common import config
 from keystone import exception
 from keystone.i18n import _, _LE
 from keystone.openstack.common import fileutils
-from keystone.openstack.common import log
 
 
 LOG = log.getLogger(__name__)

keystone/contrib/federation/utils.py

@@ -15,13 +15,13 @@
 import re
 
 import jsonschema
+from oslo_log import log
 from oslo_utils import timeutils
 import six
 
 from keystone.common import config
 from keystone import exception
 from keystone.i18n import _, _LW
-from keystone.openstack.common import log
 
 
 CONF = config.CONF

keystone/contrib/oauth1/validator.py

@@ -14,12 +14,12 @@
 
 """oAuthlib request validator."""
 
+from oslo_log import log
 import six
 
 from keystone.common import dependency
 from keystone.contrib.oauth1 import core as oauth1
 from keystone import exception
-from keystone.openstack.common import log
 
 
 METHOD_NAME = 'oauth_validator'

keystone/contrib/revoke/core.py

@@ -13,6 +13,7 @@
 import abc
 import datetime
 
+from oslo_log import log
 from oslo_utils import timeutils
 import six
 
@@ -25,7 +26,6 @@ from keystone.contrib.revoke import model
 from keystone import exception
 from keystone.i18n import _
 from keystone import notifications
-from keystone.openstack.common import log
 from keystone.openstack.common import versionutils
 
 

keystone/contrib/user_crud/core.py

@@ -15,13 +15,14 @@
 import copy
 import uuid
 
+from oslo_log import log
+
 from keystone.common import dependency
 from keystone.common import extension
 from keystone.common import wsgi
 from keystone import exception
 from keystone import identity
 from keystone.models import token_model
-from keystone.openstack.common import log
 
 
 LOG = log.getLogger(__name__)

keystone/controllers.py

@@ -12,6 +12,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from oslo_log import log
 from oslo_serialization import jsonutils
 import webob
 
@@ -19,7 +20,6 @@ from keystone.common import extension
 from keystone.common import json_home
 from keystone.common import wsgi
 from keystone import exception
-from keystone.openstack.common import log
 
 
 LOG = log.getLogger(__name__)

keystone/credential/core.py

@@ -16,6 +16,7 @@
 
 import abc
 
+from oslo_log import log
 import six
 
 from keystone.common import dependency
@@ -23,7 +24,6 @@ from keystone.common import driver_hints
 from keystone.common import manager
 from keystone import config
 from keystone import exception
-from keystone.openstack.common import log
 
 
 CONF = config.CONF

keystone/exception.py

@@ -12,12 +12,12 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from oslo_log import log
 from oslo_utils import encodeutils
 import six
 
 from keystone.common import config
 from keystone.i18n import _, _LW
-from keystone.openstack.common import log
 
 
 CONF = config.CONF

keystone/identity/backends/ldap.py

@@ -16,6 +16,7 @@ import uuid
 
 import ldap
 import ldap.filter
+from oslo_log import log
 import six
 
 from keystone import clean
@@ -26,7 +27,6 @@ from keystone import config
 from keystone import exception
 from keystone.i18n import _
 from keystone import identity
-from keystone.openstack.common import log
 
 
 CONF = config.CONF

keystone/identity/controllers.py

@@ -14,12 +14,13 @@
 
 """Workflow Logic the Identity service."""
 
+from oslo_log import log
+
 from keystone.common import controller
 from keystone.common import dependency
 from keystone import config
 from keystone import exception
 from keystone.i18n import _, _LW
-from keystone.openstack.common import log
 
 
 CONF = config.CONF

keystone/identity/core.py

@@ -20,6 +20,7 @@ import os
 import uuid
 
 from oslo_config import cfg
+from oslo_log import log
 from oslo_utils import importutils
 import six
 
@@ -32,7 +33,6 @@ from keystone import exception
 from keystone.i18n import _, _LW
 from keystone.identity.mapping_backends import mapping
 from keystone import notifications
-from keystone.openstack.common import log
 
 
 CONF = config.CONF

keystone/middleware/core.py

@@ -12,6 +12,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from oslo_log import log
 from oslo_middleware import sizelimit
 from oslo_serialization import jsonutils
 import six
@@ -22,7 +23,6 @@ from keystone.common import wsgi
 from keystone import exception
 from keystone.i18n import _LW
 from keystone.models import token_model
-from keystone.openstack.common import log
 from keystone.openstack.common import versionutils
 
 CONF = config.CONF

keystone/notifications.py

@@ -20,6 +20,7 @@ import logging
 import socket
 
 from oslo_config import cfg
+from oslo_log import log
 import oslo_messaging
 import pycadf
 from pycadf import cadftaxonomy as taxonomy
@@ -29,7 +30,6 @@ from pycadf import eventfactory
 from pycadf import resource
 
 from keystone.i18n import _, _LE
-from keystone.openstack.common import log
 
 
 notifier_opts = [

keystone/policy/backends/rules.py

@@ -17,10 +17,11 @@
 
 import os.path
 
+from oslo_log import log
+
 from keystone.common import utils
 from keystone import config
 from keystone import exception
-from keystone.openstack.common import log
 from keystone.openstack.common import policy as common_policy
 from keystone import policy
 

keystone/resource/backends/ldap.py

@@ -14,6 +14,8 @@ from __future__ import absolute_import
 
 import uuid
 
+from oslo_log import log
+
 from keystone import clean
 from keystone.common import driver_hints
 from keystone.common import ldap as common_ldap
@@ -22,7 +24,6 @@ from keystone import config
 from keystone import exception
 from keystone.i18n import _
 from keystone.identity.backends import ldap as ldap_identity
-from keystone.openstack.common import log
 from keystone import resource
 
 

keystone/resource/backends/sql.py

@@ -10,12 +10,13 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from oslo_log import log
+
 from keystone import clean
 from keystone.common import sql
 from keystone import config
 from keystone import exception
 from keystone.i18n import _LE
-from keystone.openstack.common import log
 from keystone import resource as keystone_resource
 
 

keystone/resource/controllers.py

@@ -17,13 +17,14 @@
 
 import uuid
 
+from oslo_log import log
+
 from keystone.common import controller
 from keystone.common import dependency
 from keystone.common import validation
 from keystone import config
 from keystone import exception
 from keystone.i18n import _
-from keystone.openstack.common import log
 from keystone.resource import schema
 
 

keystone/resource/core.py

@@ -14,6 +14,7 @@
 
 import abc
 
+from oslo_log import log
 import six
 
 from keystone import clean
@@ -25,7 +26,6 @@ from keystone import config
 from keystone import exception
 from keystone.i18n import _, _LE
 from keystone import notifications
-from keystone.openstack.common import log
 
 
 CONF = config.CONF

keystone/service.py

@@ -15,6 +15,7 @@
 import functools
 import sys
 
+from oslo_log import log
 from paste import deploy
 import routes
 
@@ -26,7 +27,6 @@ from keystone import config
 from keystone import controllers
 from keystone import credential
 from keystone import identity
-from keystone.openstack.common import log
 from keystone import policy
 from keystone import resource
 from keystone import routers

keystone/tests/unit/core.py

@@ -27,6 +27,7 @@ import warnings
 
 import fixtures
 from oslo_config import fixture as config_fixture
+from oslo_log import log
 import oslotest.base as oslotest
 from oslotest import mockpatch
 import six
@@ -50,7 +51,6 @@ from keystone import controllers
 from keystone import exception
 from keystone.i18n import _LW
 from keystone import notifications
-from keystone.openstack.common import log
 from keystone.server import common
 from keystone import service
 from keystone.tests.unit import ksfixtures
@@ -84,6 +84,7 @@ def _calc_tmpdir():
 TMPDIR = _calc_tmpdir()
 
 CONF = config.CONF
+log.register_options(CONF)
 
 IN_MEM_DB_CONN_STRING = 'sqlite://'
 

keystone/tests/unit/fakeldap.py

@@ -26,13 +26,13 @@ import re
 import shelve
 
 import ldap
+from oslo_log import log
 import six
 from six import moves
 
 from keystone.common.ldap import core
 from keystone import config
 from keystone import exception
-from keystone.openstack.common import log
 
 
 SCOPE_NAMES = {

keystone/tests/unit/test_core.py

@@ -15,10 +15,10 @@
 import sys
 import warnings
 
+from oslo_log import log
 from sqlalchemy import exc
 from testtools import matchers
 
-from keystone.openstack.common import log
 from keystone.tests import unit as tests
 
 

keystone/tests/unit/test_v3_federation.py

@@ -17,6 +17,7 @@ import uuid
 
 from lxml import etree
 import mock
+from oslo_log import log
 from oslo_serialization import jsonutils
 from oslotest import mockpatch
 import saml2
@@ -32,7 +33,6 @@ from keystone.contrib.federation import idp as keystone_idp
 from keystone.contrib.federation import utils as mapping_utils
 from keystone import exception
 from keystone import notifications
-from keystone.openstack.common import log
 from keystone.tests.unit import federation_fixtures
 from keystone.tests.unit import mapping_fixtures
 from keystone.tests.unit import test_v3

keystone/tests/unit/utils.py

@@ -17,11 +17,11 @@ import os
 import time
 import uuid
 
+from oslo_log import log
 import six
 from testtools import testcase
 
 from keystone.common import environment
-from keystone.openstack.common import log
 
 
 LOG = log.getLogger(__name__)

keystone/token/controllers.py

@@ -16,6 +16,7 @@ import datetime
 import sys
 
 from keystoneclient.common import cms
+from oslo_log import log
 from oslo_serialization import jsonutils
 from oslo_utils import timeutils
 import six
@@ -27,7 +28,6 @@ from keystone import config
 from keystone import exception
 from keystone.i18n import _
 from keystone.models import token_model
-from keystone.openstack.common import log
 from keystone.token import provider
 
 

keystone/token/core.py

@@ -14,10 +14,11 @@
 
 """Main entry point into the Token service."""
 
+from oslo_log import log
+
 from keystone import config
 from keystone import exception
 from keystone.i18n import _
-from keystone.openstack.common import log
 from keystone.openstack.common import versionutils
 from keystone.token import persistence
 from keystone.token import provider

keystone/token/persistence/backends/kvs.py

@@ -16,6 +16,7 @@
 from __future__ import absolute_import
 import copy
 
+from oslo_log import log
 from oslo_utils import timeutils
 import six
 
@@ -23,7 +24,6 @@ from keystone.common import kvs
 from keystone import config
 from keystone import exception
 from keystone.i18n import _, _LE, _LW
-from keystone.openstack.common import log
 from keystone import token
 from keystone.token import provider
 

keystone/token/persistence/backends/sql.py

@@ -15,13 +15,13 @@
 import copy
 import functools
 
+from oslo_log import log
 from oslo_utils import timeutils
 
 from keystone.common import sql
 from keystone import config
 from keystone import exception
 from keystone.i18n import _LI
-from keystone.openstack.common import log
 from keystone import token
 from keystone.token import provider
 

keystone/token/persistence/core.py

@@ -17,6 +17,7 @@
 import abc
 import copy
 
+from oslo_log import log
 from oslo_utils import timeutils
 import six
 
@@ -26,7 +27,6 @@ from keystone.common import manager
 from keystone import config
 from keystone import exception
 from keystone.i18n import _LW
-from keystone.openstack.common import log
 from keystone.openstack.common import versionutils
 
 

keystone/token/provider.py

@@ -21,6 +21,7 @@ import sys
 import uuid
 
 from keystoneclient.common import cms
+from oslo_log import log
 from oslo_utils import timeutils
 import six
 
@@ -32,7 +33,6 @@ from keystone import exception
 from keystone.i18n import _, _LE, _LW
 from keystone.models import token_model
 from keystone import notifications
-from keystone.openstack.common import log
 from keystone.openstack.common import versionutils
 from keystone.token import persistence
 

keystone/token/providers/common.py

@@ -12,6 +12,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from oslo_log import log
 from oslo_serialization import jsonutils
 from oslo_utils import timeutils
 import six
@@ -22,7 +23,6 @@ from keystone import config
 from keystone.contrib import federation
 from keystone import exception
 from keystone.i18n import _, _LE
-from keystone.openstack.common import log
 from keystone import token
 from keystone.token import provider
 

keystone/token/providers/pki.py

@@ -15,6 +15,7 @@
 """Keystone PKI Token Provider"""
 
 from keystoneclient.common import cms
+from oslo_log import log
 from oslo_serialization import jsonutils
 
 from keystone.common import environment
@@ -22,7 +23,6 @@ from keystone.common import utils
 from keystone import config
 from keystone import exception
 from keystone.i18n import _, _LE
-from keystone.openstack.common import log
 from keystone.token.providers import common
 
 

keystone/token/providers/pkiz.py

@@ -13,6 +13,7 @@
 """Keystone Compressed PKI Token Provider"""
 
 from keystoneclient.common import cms
+from oslo_log import log
 from oslo_serialization import jsonutils
 
 from keystone.common import environment
@@ -20,7 +21,6 @@ from keystone.common import utils
 from keystone import config
 from keystone import exception
 from keystone.i18n import _
-from keystone.openstack.common import log
 from keystone.token.providers import common
 
 

keystone/trust/backends/sql.py

@@ -14,11 +14,11 @@
 
 import time
 
+from oslo_log import log
 from oslo_utils import timeutils
 
 from keystone.common import sql
 from keystone import exception
-from keystone.openstack.common import log
 from keystone import trust
 
 

keystone/trust/controllers.py

@@ -14,6 +14,7 @@
 
 import uuid
 
+from oslo_log import log
 from oslo_utils import timeutils
 import six
 
@@ -25,7 +26,6 @@ from keystone import config
 from keystone import exception
 from keystone.i18n import _
 from keystone.models import token_model
-from keystone.openstack.common import log
 from keystone.trust import schema
 
 

keystone/trust/core.py

@@ -16,6 +16,7 @@
 
 import abc
 
+from oslo_log import log
 import six
 
 from keystone.common import dependency
@@ -24,7 +25,6 @@ from keystone import config
 from keystone import exception
 from keystone.i18n import _
 from keystone import notifications
-from keystone.openstack.common import log
 
 
 CONF = config.CONF

requirements-py3.txt

@@ -25,6 +25,7 @@ oslo.config>=1.6.0  # Apache-2.0
 # oslo.messaging>=1.6.0  # Apache-2.0
 oslo.db>=1.4.1  # Apache-2.0
 oslo.i18n>=1.3.0  # Apache-2.0
+oslo.log>=0.1.0            # Apache-2.0
 oslo.middleware>=0.3.0                  # Apache-2.0
 oslo.serialization>=1.2.0               # Apache-2.0
 oslo.utils>=1.2.0                       # Apache-2.0

requirements.txt

@@ -23,6 +23,7 @@ oslo.config>=1.6.0  # Apache-2.0
 oslo.messaging>=1.6.0  # Apache-2.0
 oslo.db>=1.4.1  # Apache-2.0
 oslo.i18n>=1.3.0  # Apache-2.0
+oslo.log>=0.1.0            # Apache-2.0
 oslo.middleware>=0.3.0                  # Apache-2.0
 oslo.serialization>=1.2.0               # Apache-2.0
 oslo.utils>=1.2.0                       # Apache-2.0

setup.cfg

@@ -67,5 +67,4 @@ oslo.config.opts =
     keystone = keystone.common.config:list_opts
     keystone.notifications = keystone.notifications:list_opts
     keystone.openstack.common.eventlet_backdoor = keystone.openstack.common.eventlet_backdoor:list_opts
-    keystone.openstack.common.log = keystone.openstack.common.log:list_opts
     keystone.openstack.common.policy = keystone.openstack.common.policy:list_opts