diff --git a/karbor/api/openstack/__init__.py b/karbor/api/openstack/__init__.py index 7d5cf6a9..fd7d1792 100644 --- a/karbor/api/openstack/__init__.py +++ b/karbor/api/openstack/__init__.py @@ -18,13 +18,9 @@ WSGI middleware for OpenStack API controllers. """ -from oslo_log import log as logging import routes -LOG = logging.getLogger(__name__) - - class APIMapper(routes.Mapper): def routematch(self, url=None, environ=None): if url is "": diff --git a/karbor/api/versions.py b/karbor/api/versions.py index b9619152..3d93b7e4 100644 --- a/karbor/api/versions.py +++ b/karbor/api/versions.py @@ -12,15 +12,11 @@ import httplib from karbor.api.openstack import wsgi -from oslo_log import log as logging import webob.dec from oslo_serialization import jsonutils -LOG = logging.getLogger(__name__) - - class Versions(object): @classmethod diff --git a/karbor/context.py b/karbor/context.py index c0a565f6..375cf922 100644 --- a/karbor/context.py +++ b/karbor/context.py @@ -18,7 +18,6 @@ import copy from oslo_config import cfg from oslo_context import context -from oslo_log import log as logging from oslo_utils import timeutils import six @@ -27,8 +26,6 @@ from karbor import policy CONF = cfg.CONF -LOG = logging.getLogger(__name__) - class RequestContext(context.RequestContext): """Security context and request information. diff --git a/karbor/manager.py b/karbor/manager.py index 54db9e1d..1150a278 100644 --- a/karbor/manager.py +++ b/karbor/manager.py @@ -40,7 +40,6 @@ This module provides Manager, a base class for managers. from oslo_config import cfg -from oslo_log import log as logging import oslo_messaging as messaging from oslo_service import periodic_task @@ -49,7 +48,6 @@ from karbor import version CONF = cfg.CONF -LOG = logging.getLogger(__name__) class PeriodicTasks(periodic_task.PeriodicTasks): diff --git a/karbor/objects/checkpoint_record.py b/karbor/objects/checkpoint_record.py index 5edfa98d..d69006e1 100644 --- a/karbor/objects/checkpoint_record.py +++ b/karbor/objects/checkpoint_record.py @@ -11,7 +11,6 @@ # under the License. from oslo_config import cfg -from oslo_log import log as logging from oslo_versionedobjects import fields from karbor import db @@ -20,7 +19,6 @@ from karbor.i18n import _ from karbor.objects import base CONF = cfg.CONF -LOG = logging.getLogger(__name__) @base.KarborObjectRegistry.register diff --git a/karbor/services/operationengine/api.py b/karbor/services/operationengine/api.py index c1a487bd..91dbd256 100644 --- a/karbor/services/operationengine/api.py +++ b/karbor/services/operationengine/api.py @@ -13,15 +13,10 @@ """Handles all requests relating to OperationEngine.""" -from oslo_log import log as logging - from karbor.db import base from karbor.services.operationengine import rpcapi as oe_rpcapi -LOG = logging.getLogger(__name__) - - class API(base.Base): """API for interacting with the OperationEngine manager.""" diff --git a/karbor/services/protection/api.py b/karbor/services/protection/api.py index 895569d4..c68baa77 100644 --- a/karbor/services/protection/api.py +++ b/karbor/services/protection/api.py @@ -13,15 +13,10 @@ """Handles all requests relating to protection service.""" -from oslo_log import log as logging - from karbor.db import base from karbor.services.protection import rpcapi as protection_rpcapi -LOG = logging.getLogger(__name__) - - class API(base.Base): """API for interacting with the protection manager.""" diff --git a/karbor/services/protection/bank_plugin.py b/karbor/services/protection/bank_plugin.py index 1d58ad64..3b4e77d0 100644 --- a/karbor/services/protection/bank_plugin.py +++ b/karbor/services/protection/bank_plugin.py @@ -14,12 +14,8 @@ import abc import os import six -from oslo_log import log as logging - from karbor import exception -LOG = logging.getLogger(__name__) - @six.add_metaclass(abc.ABCMeta) class LeasePlugin(object): diff --git a/karbor/services/protection/clients/swift.py b/karbor/services/protection/clients/swift.py index 89b8c760..1e7e367e 100644 --- a/karbor/services/protection/clients/swift.py +++ b/karbor/services/protection/clients/swift.py @@ -11,11 +11,8 @@ # under the License. from oslo_config import cfg -from oslo_log import log as logging from swiftclient import client as swift -LOG = logging.getLogger(__name__) - SERVICE = 'swift' swift_client_opts = [ cfg.StrOpt(SERVICE + '_endpoint', diff --git a/karbor/services/protection/protectable_plugins/project.py b/karbor/services/protection/protectable_plugins/project.py index c39e272e..9c7bb0d6 100644 --- a/karbor/services/protection/protectable_plugins/project.py +++ b/karbor/services/protection/protectable_plugins/project.py @@ -14,9 +14,6 @@ from karbor.common import constants from karbor import resource from karbor.services.protection import protectable_plugin -from oslo_log import log as logging - -LOG = logging.getLogger(__name__) class ProjectProtectablePlugin(protectable_plugin.ProtectablePlugin): diff --git a/karbor/services/protection/protectable_registry.py b/karbor/services/protection/protectable_registry.py index 01116036..a7f62050 100644 --- a/karbor/services/protection/protectable_registry.py +++ b/karbor/services/protection/protectable_registry.py @@ -15,11 +15,8 @@ from karbor.i18n import _ from karbor.services.protection.graph import build_graph import six -from oslo_log import log as logging from stevedore import extension -LOG = logging.getLogger(__name__) - class ProtectablePluginLoadFailed(exception.KarborException): message = _("Could not load %(name)s: %(error)s") diff --git a/karbor/services/protection/protection_plugin.py b/karbor/services/protection/protection_plugin.py index 7bdbdffa..ef3e71ed 100644 --- a/karbor/services/protection/protection_plugin.py +++ b/karbor/services/protection/protection_plugin.py @@ -9,10 +9,6 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. -from oslo_log import log as logging - - -LOG = logging.getLogger(__name__) class Operation(object): diff --git a/karbor/services/protection/protection_plugins/noop_plugin.py b/karbor/services/protection/protection_plugins/noop_plugin.py index 7b80f63e..fa6405c7 100644 --- a/karbor/services/protection/protection_plugins/noop_plugin.py +++ b/karbor/services/protection/protection_plugins/noop_plugin.py @@ -12,10 +12,6 @@ from karbor.common import constants from karbor.services.protection import protection_plugin -from oslo_log import log as logging - - -LOG = logging.getLogger(__name__) class NoopOperation(protection_plugin.Operation):