Remove unnecessary LOG initialisation

Remove a lot of getLogger lines and imports of logging in modules
which never use that functionality.

Change-Id: Icdaee2c540980412b000d02ebf1ec568dcf5b38a

81 files changed, 0 insertions, 212 deletions

diff --git a/nova/api/openstack/auth.py b/nova/api/openstack/auth.py
index 67d77f5a6..1fab3e83d 100644
--- a/nova/api/openstack/auth.py
+++ b/nova/api/openstack/auth.py
@@ -23,10 +23,8 @@ import webob.exc
 
 from nova.api.openstack import wsgi
 from nova import context
-from nova.openstack.common import log as logging
 from nova import wsgi as base_wsgi
 
-LOG = logging.getLogger(__name__)
 CONF = cfg.CONF
 CONF.import_opt('use_forwarded_for', 'nova.api.auth')
 
diff --git a/nova/api/openstack/compute/__init__.py b/nova/api/openstack/compute/__init__.py
index 6b05dcf5f..a46d51eaf 100644
--- a/nova/api/openstack/compute/__init__.py
+++ b/nova/api/openstack/compute/__init__.py
@@ -33,9 +33,6 @@ from nova.api.openstack.compute import limits
 from nova.api.openstack.compute import server_metadata
 from nova.api.openstack.compute import servers
 from nova.api.openstack.compute import versions
-from nova.openstack.common import log as logging
-
-LOG = logging.getLogger(__name__)
 
 allow_instance_snapshots_opt = cfg.BoolOpt('allow_instance_snapshots',
         default=True,
diff --git a/nova/api/openstack/compute/contrib/agents.py b/nova/api/openstack/compute/contrib/agents.py
index 7756187f3..02e752dac 100644
--- a/nova/api/openstack/compute/contrib/agents.py
+++ b/nova/api/openstack/compute/contrib/agents.py
@@ -22,10 +22,8 @@ from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
 from nova import db
 from nova import exception
-from nova.openstack.common import log as logging
 
 
-LOG = logging.getLogger(__name__)
 authorize = extensions.extension_authorizer('compute', 'agents')
 
 
diff --git a/nova/api/openstack/compute/contrib/availability_zone.py b/nova/api/openstack/compute/contrib/availability_zone.py
index f5092010c..14602265b 100644
--- a/nova/api/openstack/compute/contrib/availability_zone.py
+++ b/nova/api/openstack/compute/contrib/availability_zone.py
@@ -22,10 +22,8 @@ from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
 from nova import availability_zones
 from nova import db
-from nova.openstack.common import log as logging
 from nova import servicegroup
 
-LOG = logging.getLogger(__name__)
 CONF = cfg.CONF
 
 authorize_list = extensions.extension_authorizer('compute',
diff --git a/nova/api/openstack/compute/contrib/baremetal_nodes.py b/nova/api/openstack/compute/contrib/baremetal_nodes.py
index 0f2d30935..b3f226039 100644
--- a/nova/api/openstack/compute/contrib/baremetal_nodes.py
+++ b/nova/api/openstack/compute/contrib/baremetal_nodes.py
@@ -21,10 +21,8 @@ from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
 from nova import exception
-from nova.openstack.common import log as logging
 from nova.virt.baremetal import db
 
-LOG = logging.getLogger(__name__)
 authorize = extensions.extension_authorizer('compute', 'baremetal_nodes')
 
 node_fields = ['id', 'cpus', 'local_gb', 'memory_mb', 'pm_address',
diff --git a/nova/api/openstack/compute/contrib/certificates.py b/nova/api/openstack/compute/contrib/certificates.py
index 2d8e8ad6d..64a6e26fe 100644
--- a/nova/api/openstack/compute/contrib/certificates.py
+++ b/nova/api/openstack/compute/contrib/certificates.py
@@ -21,9 +21,7 @@ from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
 import nova.cert.rpcapi
 from nova import network
-from nova.openstack.common import log as logging
 
-LOG = logging.getLogger(__name__)
 authorize = extensions.extension_authorizer('compute', 'certificates')
 
 
diff --git a/nova/api/openstack/compute/contrib/cloudpipe.py b/nova/api/openstack/compute/contrib/cloudpipe.py
index 01e6f8303..d1c906d64 100644
--- a/nova/api/openstack/compute/contrib/cloudpipe.py
+++ b/nova/api/openstack/compute/contrib/cloudpipe.py
@@ -27,12 +27,10 @@ from nova import db
 from nova import exception
 from nova import network
 from nova.openstack.common import fileutils
-from nova.openstack.common import log as logging
 from nova.openstack.common import timeutils
 from nova import utils
 
 CONF = cfg.CONF
-LOG = logging.getLogger(__name__)
 authorize = extensions.extension_authorizer('compute', 'cloudpipe')
 
 
diff --git a/nova/api/openstack/compute/contrib/cloudpipe_update.py b/nova/api/openstack/compute/contrib/cloudpipe_update.py
index a096c7107..1e6cafe04 100644
--- a/nova/api/openstack/compute/contrib/cloudpipe_update.py
+++ b/nova/api/openstack/compute/contrib/cloudpipe_update.py
@@ -20,9 +20,7 @@ import webob.exc
 from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova import db
-from nova.openstack.common import log as logging
 
-LOG = logging.getLogger(__name__)
 authorize = extensions.extension_authorizer('compute', 'cloudpipe_update')
 
 
diff --git a/nova/api/openstack/compute/contrib/console_output.py b/nova/api/openstack/compute/contrib/console_output.py
index b3588d344..eb20b3275 100644
--- a/nova/api/openstack/compute/contrib/console_output.py
+++ b/nova/api/openstack/compute/contrib/console_output.py
@@ -23,10 +23,8 @@ from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova import compute
 from nova import exception
-from nova.openstack.common import log as logging
 
 
-LOG = logging.getLogger(__name__)
 authorize = extensions.extension_authorizer('compute', 'console_output')
 
 
diff --git a/nova/api/openstack/compute/contrib/consoles.py b/nova/api/openstack/compute/contrib/consoles.py
index ade5261b2..bf1f41690 100644
--- a/nova/api/openstack/compute/contrib/consoles.py
+++ b/nova/api/openstack/compute/contrib/consoles.py
@@ -20,10 +20,8 @@ from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova import compute
 from nova import exception
-from nova.openstack.common import log as logging
 
 
-LOG = logging.getLogger(__name__)
 authorize = extensions.extension_authorizer('compute', 'consoles')
 
 
diff --git a/nova/api/openstack/compute/contrib/deferred_delete.py b/nova/api/openstack/compute/contrib/deferred_delete.py
index 30358b376..e4c2a29a4 100644
--- a/nova/api/openstack/compute/contrib/deferred_delete.py
+++ b/nova/api/openstack/compute/contrib/deferred_delete.py
@@ -22,10 +22,8 @@ from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova import compute
 from nova import exception
-from nova.openstack.common import log as logging
 
 
-LOG = logging.getLogger(__name__)
 authorize = extensions.extension_authorizer('compute', 'deferred_delete')
 
 
diff --git a/nova/api/openstack/compute/contrib/extended_availability_zone.py b/nova/api/openstack/compute/contrib/extended_availability_zone.py
index a1ee85bcf..9eec055b1 100644
--- a/nova/api/openstack/compute/contrib/extended_availability_zone.py
+++ b/nova/api/openstack/compute/contrib/extended_availability_zone.py
@@ -21,10 +21,8 @@ from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
 from nova import availability_zones
-from nova.openstack.common import log as logging
 from nova.openstack.common import memorycache
 
-LOG = logging.getLogger(__name__)
 # NOTE(vish): azs don't change that often, so cache them for an hour to
 #             avoid hitting the db multiple times on every request.
 AZ_CACHE_SECONDS = 60 * 60
diff --git a/nova/api/openstack/compute/contrib/extended_ips.py b/nova/api/openstack/compute/contrib/extended_ips.py
index 0a3432a46..ac75293a6 100644
--- a/nova/api/openstack/compute/contrib/extended_ips.py
+++ b/nova/api/openstack/compute/contrib/extended_ips.py
@@ -22,9 +22,7 @@ from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
 from nova import compute
-from nova.openstack.common import log as logging
 
-LOG = logging.getLogger(__name__)
 authorize = extensions.soft_extension_authorizer('compute', 'extended_ips')
 
 
diff --git a/nova/api/openstack/compute/contrib/extended_server_attributes.py b/nova/api/openstack/compute/contrib/extended_server_attributes.py
index 4f74f389d..a8b441f80 100644
--- a/nova/api/openstack/compute/contrib/extended_server_attributes.py
+++ b/nova/api/openstack/compute/contrib/extended_server_attributes.py
@@ -17,9 +17,7 @@
 from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
-from nova.openstack.common import log as logging
 
-LOG = logging.getLogger(__name__)
 authorize = extensions.soft_extension_authorizer('compute',
                                                  'extended_server_attributes')
 
diff --git a/nova/api/openstack/compute/contrib/extended_status.py b/nova/api/openstack/compute/contrib/extended_status.py
index 930893b27..75086309a 100644
--- a/nova/api/openstack/compute/contrib/extended_status.py
+++ b/nova/api/openstack/compute/contrib/extended_status.py
@@ -18,9 +18,7 @@ from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
 from nova import compute
-from nova.openstack.common import log as logging
 
-LOG = logging.getLogger(__name__)
 authorize = extensions.soft_extension_authorizer('compute', 'extended_status')
 
 
diff --git a/nova/api/openstack/compute/contrib/extended_virtual_interfaces_net.py b/nova/api/openstack/compute/contrib/extended_virtual_interfaces_net.py
index d087472bb..8779d6879 100644
--- a/nova/api/openstack/compute/contrib/extended_virtual_interfaces_net.py
+++ b/nova/api/openstack/compute/contrib/extended_virtual_interfaces_net.py
@@ -19,9 +19,7 @@ from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
 from nova import network
-from nova.openstack.common import log as logging
 
-LOG = logging.getLogger(__name__)
 authorize = extensions.soft_extension_authorizer('compute', 'extended_vif_net')
 
 
diff --git a/nova/api/openstack/compute/contrib/fixed_ips.py b/nova/api/openstack/compute/contrib/fixed_ips.py
index e88038f3f..8c7e4f7d3 100644
--- a/nova/api/openstack/compute/contrib/fixed_ips.py
+++ b/nova/api/openstack/compute/contrib/fixed_ips.py
@@ -19,9 +19,7 @@ import webob.exc
 from nova.api.openstack import extensions
 from nova import db
 from nova import exception
-from nova.openstack.common import log as logging
 
-LOG = logging.getLogger(__name__)
 authorize = extensions.extension_authorizer('compute', 'fixed_ips')
 
 
diff --git a/nova/api/openstack/compute/contrib/flavormanage.py b/nova/api/openstack/compute/contrib/flavormanage.py
index 7cff7f4b8..ddf8aa5af 100644
--- a/nova/api/openstack/compute/contrib/flavormanage.py
+++ b/nova/api/openstack/compute/contrib/flavormanage.py
@@ -20,10 +20,8 @@ from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova.compute import instance_types
 from nova import exception
-from nova.openstack.common import log as logging
 
 
-LOG = logging.getLogger(__name__)
 authorize = extensions.extension_authorizer('compute', 'flavormanage')
 
 
diff --git a/nova/api/openstack/compute/contrib/floating_ip_dns.py b/nova/api/openstack/compute/contrib/floating_ip_dns.py
index 62eb0d08f..ecaa8e7b9 100644
--- a/nova/api/openstack/compute/contrib/floating_ip_dns.py
+++ b/nova/api/openstack/compute/contrib/floating_ip_dns.py
@@ -23,11 +23,9 @@ from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
 from nova import exception
 from nova import network
-from nova.openstack.common import log as logging
 from nova import utils
 
 
-LOG = logging.getLogger(__name__)
 authorize = extensions.extension_authorizer('compute', 'floating_ip_dns')
 
 
diff --git a/nova/api/openstack/compute/contrib/floating_ip_pools.py b/nova/api/openstack/compute/contrib/floating_ip_pools.py
index 3361230dd..e792ce433 100644
--- a/nova/api/openstack/compute/contrib/floating_ip_pools.py
+++ b/nova/api/openstack/compute/contrib/floating_ip_pools.py
@@ -18,10 +18,8 @@ from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
 from nova import network
-from nova.openstack.common import log as logging
 
 
-LOG = logging.getLogger(__name__)
 authorize = extensions.extension_authorizer('compute', 'floating_ip_pools')
 
 
diff --git a/nova/api/openstack/compute/contrib/fping.py b/nova/api/openstack/compute/contrib/fping.py
index e1a8dfb8c..0e6bb5ae5 100644
--- a/nova/api/openstack/compute/contrib/fping.py
+++ b/nova/api/openstack/compute/contrib/fping.py
@@ -26,10 +26,8 @@ from nova.api.openstack import common
 from nova.api.openstack import extensions
 from nova import compute
 from nova import exception
-from nova.openstack.common import log as logging
 from nova import utils
 
-LOG = logging.getLogger(__name__)
 authorize = extensions.extension_authorizer('compute', 'fping')
 authorize_all_tenants = extensions.extension_authorizer(
     'compute', 'fping:all_tenants')
diff --git a/nova/api/openstack/compute/contrib/hide_server_addresses.py b/nova/api/openstack/compute/contrib/hide_server_addresses.py
index 08e33ce53..cdd793218 100644
--- a/nova/api/openstack/compute/contrib/hide_server_addresses.py
+++ b/nova/api/openstack/compute/contrib/hide_server_addresses.py
@@ -20,7 +20,6 @@ from oslo.config import cfg
 from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova.compute import vm_states
-from nova.openstack.common import log as logging
 
 opts = [
     cfg.ListOpt('osapi_hide_server_address_states',
@@ -31,7 +30,6 @@ opts = [
 
 CONF = cfg.CONF
 CONF.register_opts(opts)
-LOG = logging.getLogger(__name__)
 
 authorize = extensions.soft_extension_authorizer('compute',
                                                  'hide_server_addresses')
diff --git a/nova/api/openstack/compute/contrib/hypervisors.py b/nova/api/openstack/compute/contrib/hypervisors.py
index 28cb0f291..26ef2c81b 100644
--- a/nova/api/openstack/compute/contrib/hypervisors.py
+++ b/nova/api/openstack/compute/contrib/hypervisors.py
@@ -22,10 +22,8 @@ from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
 from nova import compute
 from nova import exception
-from nova.openstack.common import log as logging
 
 
-LOG = logging.getLogger(__name__)
 authorize = extensions.extension_authorizer('compute', 'hypervisors')
 
 
diff --git a/nova/api/openstack/compute/contrib/rescue.py b/nova/api/openstack/compute/contrib/rescue.py
index 87d838bdf..c5fcd1442 100644
--- a/nova/api/openstack/compute/contrib/rescue.py
+++ b/nova/api/openstack/compute/contrib/rescue.py
@@ -23,12 +23,10 @@ from nova.api.openstack import extensions as exts
 from nova.api.openstack import wsgi
 from nova import compute
 from nova import exception
-from nova.openstack.common import log as logging
 from nova import utils
 
 
 CONF = cfg.CONF
-LOG = logging.getLogger(__name__)
 authorize = exts.extension_authorizer('compute', 'rescue')
 
 
diff --git a/nova/api/openstack/compute/contrib/scheduler_hints.py b/nova/api/openstack/compute/contrib/scheduler_hints.py
index 637698b31..0775307f4 100644
--- a/nova/api/openstack/compute/contrib/scheduler_hints.py
+++ b/nova/api/openstack/compute/contrib/scheduler_hints.py
@@ -18,9 +18,6 @@ import webob.exc
 
 from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
-import nova.openstack.common.log as logging
-
-LOG = logging.getLogger(__name__)
 
 
 class SchedulerHintsController(wsgi.Controller):
diff --git a/nova/api/openstack/compute/contrib/security_groups.py b/nova/api/openstack/compute/contrib/security_groups.py
index 700d9b71e..de5a9bd8e 100644
--- a/nova/api/openstack/compute/contrib/security_groups.py
+++ b/nova/api/openstack/compute/contrib/security_groups.py
@@ -30,11 +30,9 @@ from nova.compute import api as compute_api
 from nova import exception
 from nova.network.security_group import openstack_driver
 from nova.network.security_group import quantum_driver
-from nova.openstack.common import log as logging
 from nova.virt import netutils
 
 
-LOG = logging.getLogger(__name__)
 authorize = extensions.extension_authorizer('compute', 'security_groups')
 softauth = extensions.soft_extension_authorizer('compute', 'security_groups')
 
diff --git a/nova/api/openstack/compute/contrib/services.py b/nova/api/openstack/compute/contrib/services.py
index 5b382f892..d948c8bc5 100644
--- a/nova/api/openstack/compute/contrib/services.py
+++ b/nova/api/openstack/compute/contrib/services.py
@@ -23,11 +23,9 @@ from nova.api.openstack import xmlutil
 from nova import compute
 from nova import db
 from nova import exception
-from nova.openstack.common import log as logging
 from nova.openstack.common import timeutils
 from nova import utils
 
-LOG = logging.getLogger(__name__)
 authorize = extensions.extension_authorizer('compute', 'services')
 CONF = cfg.CONF
 CONF.import_opt('service_down_time', 'nova.service')
diff --git a/nova/api/openstack/compute/contrib/used_limits.py b/nova/api/openstack/compute/contrib/used_limits.py
index df40fe91a..e00f0a9eb 100644
--- a/nova/api/openstack/compute/contrib/used_limits.py
+++ b/nova/api/openstack/compute/contrib/used_limits.py
@@ -17,11 +17,9 @@
 from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
-from nova.openstack.common import log as logging
 from nova import quota
 
 
-LOG = logging.getLogger(__name__)
 QUOTAS = quota.QUOTAS
 
 
diff --git a/nova/api/openstack/compute/contrib/virtual_interfaces.py b/nova/api/openstack/compute/contrib/virtual_interfaces.py
index 50c26d754..9b6ca3d60 100644
--- a/nova/api/openstack/compute/contrib/virtual_interfaces.py
+++ b/nova/api/openstack/compute/contrib/virtual_interfaces.py
@@ -21,10 +21,8 @@ from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
 from nova import compute
 from nova import network
-from nova.openstack.common import log as logging
 
 
-LOG = logging.getLogger(__name__)
 authorize = extensions.extension_authorizer('compute', 'virtual_interfaces')
 
 
diff --git a/nova/api/openstack/compute/images.py b/nova/api/openstack/compute/images.py
index 3d54da0b5..4dba0a6c2 100644
--- a/nova/api/openstack/compute/images.py
+++ b/nova/api/openstack/compute/images.py
@@ -21,12 +21,9 @@ from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
 from nova import exception
 import nova.image.glance
-from nova.openstack.common import log as logging
 import nova.utils
 
 
-LOG = logging.getLogger(__name__)
-
 SUPPORTED_FILTERS = {
     'name': 'name',
     'status': 'status',
diff --git a/nova/api/openstack/compute/ips.py b/nova/api/openstack/compute/ips.py
index ee917e65e..df4b9dabf 100644
--- a/nova/api/openstack/compute/ips.py
+++ b/nova/api/openstack/compute/ips.py
@@ -22,9 +22,6 @@ from nova.api.openstack import common
 from nova.api.openstack.compute.views import addresses as view_addresses
 from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
-from nova.openstack.common import log as logging
-
-LOG = logging.getLogger(__name__)
 
 
 def make_network(elem):
diff --git a/nova/api/openstack/compute/views/addresses.py b/nova/api/openstack/compute/views/addresses.py
index fd9c3d25e..d46b6c661 100644
--- a/nova/api/openstack/compute/views/addresses.py
+++ b/nova/api/openstack/compute/views/addresses.py
@@ -18,9 +18,6 @@
 import itertools
 
 from nova.api.openstack import common
-from nova.openstack.common import log as logging
-
-LOG = logging.getLogger(__name__)
 
 
 class ViewBuilder(common.ViewBuilder):
diff --git a/nova/api/openstack/urlmap.py b/nova/api/openstack/urlmap.py
index d67b66c4d..e1b983352 100644
--- a/nova/api/openstack/urlmap.py
+++ b/nova/api/openstack/urlmap.py
@@ -20,7 +20,6 @@ import re
 import urllib2
 
 from nova.api.openstack import wsgi
-from nova.openstack.common import log as logging
 
 
 _quoted_string_re = r'"[^"\\]*(?:\\.[^"\\]*)*"'
@@ -28,8 +27,6 @@ _option_header_piece_re = re.compile(r';\s*([^\s;=]+|%s)\s*'
                                      r'(?:=\s*([^;]+|%s))?\s*' %
     (_quoted_string_re, _quoted_string_re))
 
-LOG = logging.getLogger(__name__)
-
 
 def unquote_header_value(value):
     """Unquotes a header value.
diff --git a/nova/api/sizelimit.py b/nova/api/sizelimit.py
index f1bf3cf1b..d7647ccc3 100644
--- a/nova/api/sizelimit.py
+++ b/nova/api/sizelimit.py
@@ -22,7 +22,6 @@ from oslo.config import cfg
 import webob.dec
 import webob.exc
 
-from nova.openstack.common import log as logging
 from nova import wsgi
 
 
@@ -34,7 +33,6 @@ max_request_body_size_opt = cfg.IntOpt('osapi_max_request_body_size',
 
 CONF = cfg.CONF
 CONF.register_opt(max_request_body_size_opt)
-LOG = logging.getLogger(__name__)
 
 
 class LimitingReader(object):
diff --git a/nova/availability_zones.py b/nova/availability_zones.py
index a491c9ad7..98e7f6e44 100644
--- a/nova/availability_zones.py
+++ b/nova/availability_zones.py
@@ -18,7 +18,6 @@
 from oslo.config import cfg
 
 from nova import db
-from nova.openstack.common import log as logging
 
 availability_zone_opts = [
     cfg.StrOpt('internal_service_availability_zone',
@@ -32,8 +31,6 @@ availability_zone_opts = [
 CONF = cfg.CONF
 CONF.register_opts(availability_zone_opts)
 
-LOG = logging.getLogger(__name__)
-
 
 def set_availability_zones(context, services):
     # Makes sure services isn't a sqlalchemy object
diff --git a/nova/cells/manager.py b/nova/cells/manager.py
index 04fabab54..51d2f7cac 100644
--- a/nova/cells/manager.py
+++ b/nova/cells/manager.py
@@ -28,7 +28,6 @@ from nova import context
 from nova import exception
 from nova import manager
 from nova.openstack.common import importutils
-from nova.openstack.common import log as logging
 from nova.openstack.common import timeutils
 
 cell_manager_opts = [
@@ -45,8 +44,6 @@ cell_manager_opts = [
 ]
 
 
-LOG = logging.getLogger(__name__)
-
 CONF = cfg.CONF
 CONF.register_opts(cell_manager_opts, group='cells')
 
diff --git a/nova/cells/rpcapi.py b/nova/cells/rpcapi.py
index 616dc0ec3..ca6e23fb1 100644
--- a/nova/cells/rpcapi.py
+++ b/nova/cells/rpcapi.py
@@ -26,10 +26,8 @@ from oslo.config import cfg
 
 from nova import exception
 from nova.openstack.common import jsonutils
-from nova.openstack.common import log as logging
 from nova.openstack.common.rpc import proxy as rpc_proxy
 
-LOG = logging.getLogger(__name__)
 
 CONF = cfg.CONF
 CONF.import_opt('enable', 'nova.cells.opts', group='cells')
diff --git a/nova/cert/manager.py b/nova/cert/manager.py
index de959c8e7..3bbca0b53 100644
--- a/nova/cert/manager.py
+++ b/nova/cert/manager.py
@@ -28,9 +28,6 @@ import base64
 
 from nova import crypto
 from nova import manager
-from nova.openstack.common import log as logging
-
-LOG = logging.getLogger(__name__)
 
 
 class CertManager(manager.Manager):
diff --git a/nova/compute/cells_api.py b/nova/compute/cells_api.py
index 379c9fc7d..f5ded45ec 100644
--- a/nova/compute/cells_api.py
+++ b/nova/compute/cells_api.py
@@ -25,9 +25,6 @@ from nova.compute import rpcapi as compute_rpcapi
 from nova.compute import vm_states
 from nova import exception
 from nova.openstack.common import excutils
-from nova.openstack.common import log as logging
-
-LOG = logging.getLogger(__name__)
 
 
 check_instance_state = compute_api.check_instance_state
diff --git a/nova/db/sqlalchemy/migrate_repo/versions/134_add_counters_to_bw_usage_cache.py b/nova/db/sqlalchemy/migrate_repo/versions/134_add_counters_to_bw_usage_cache.py
index b4178e3c7..612011982 100644
--- a/nova/db/sqlalchemy/migrate_repo/versions/134_add_counters_to_bw_usage_cache.py
+++ b/nova/db/sqlalchemy/migrate_repo/versions/134_add_counters_to_bw_usage_cache.py
@@ -17,10 +17,6 @@
 from sqlalchemy import Boolean, Column, DateTime, BigInteger
 from sqlalchemy import MetaData, Integer, String, Table
 
-from nova.openstack.common import log as logging
-
-LOG = logging.getLogger(__name__)
-
 
 def upgrade(migrate_engine):
     meta = MetaData()
diff --git a/nova/db/sqlalchemy/migrate_repo/versions/138_drop_server_name_from_instances.py b/nova/db/sqlalchemy/migrate_repo/versions/138_drop_server_name_from_instances.py
index d8d043b40..fd84217d7 100644
--- a/nova/db/sqlalchemy/migrate_repo/versions/138_drop_server_name_from_instances.py
+++ b/nova/db/sqlalchemy/migrate_repo/versions/138_drop_server_name_from_instances.py
@@ -14,11 +14,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from nova.openstack.common import log as logging
 from sqlalchemy import Column, String, MetaData, Table
 
-LOG = logging.getLogger(__name__)
-
 
 def upgrade(migrate_engine):
     meta = MetaData()
diff --git a/nova/db/sqlalchemy/migrate_repo/versions/146_aggregate_zones.py b/nova/db/sqlalchemy/migrate_repo/versions/146_aggregate_zones.py
index 0f39bf231..f7a5c97d7 100644
--- a/nova/db/sqlalchemy/migrate_repo/versions/146_aggregate_zones.py
+++ b/nova/db/sqlalchemy/migrate_repo/versions/146_aggregate_zones.py
@@ -14,10 +14,6 @@
 
 from sqlalchemy import String, Column, MetaData, Table, delete, select
 
-from nova.openstack.common import log as logging
-
-LOG = logging.getLogger(__name__)
-
 
 def upgrade(migrate_engine):
     meta = MetaData()
diff --git a/nova/db/sqlalchemy/migrate_repo/versions/147_no_service_zones.py b/nova/db/sqlalchemy/migrate_repo/versions/147_no_service_zones.py
index a0ad90d4e..111ed0747 100644
--- a/nova/db/sqlalchemy/migrate_repo/versions/147_no_service_zones.py
+++ b/nova/db/sqlalchemy/migrate_repo/versions/147_no_service_zones.py
@@ -14,10 +14,6 @@
 
 from sqlalchemy import String, Column, MetaData, Table, select
 
-from nova.openstack.common import log as logging
-
-LOG = logging.getLogger(__name__)
-
 
 """ Remove availability_zone column from services model and replace with
     aggregate based zone."""
diff --git a/nova/db/sqlalchemy/migrate_repo/versions/148_add_instance_actions.py b/nova/db/sqlalchemy/migrate_repo/versions/148_add_instance_actions.py
index 5e60d41cc..e11c0b0e2 100644
--- a/nova/db/sqlalchemy/migrate_repo/versions/148_add_instance_actions.py
+++ b/nova/db/sqlalchemy/migrate_repo/versions/148_add_instance_actions.py
@@ -25,10 +25,6 @@ from sqlalchemy import String
 from sqlalchemy import Table
 from sqlalchemy import Text
 
-from nova.openstack.common import log as logging
-
-LOG = logging.getLogger(__name__)
-
 
 def upgrade(migrate_engine):
     meta = MetaData()
diff --git a/nova/db/sqlalchemy/migrate_repo/versions/173_add_unique_constraint_to_key_pairs.py b/nova/db/sqlalchemy/migrate_repo/versions/173_add_unique_constraint_to_key_pairs.py
index e7c61b36d..2556ec00f 100644
--- a/nova/db/sqlalchemy/migrate_repo/versions/173_add_unique_constraint_to_key_pairs.py
+++ b/nova/db/sqlalchemy/migrate_repo/versions/173_add_unique_constraint_to_key_pairs.py
@@ -17,9 +17,7 @@ from migrate.changeset import UniqueConstraint
 from sqlalchemy import Index, MetaData, Table
 
 from nova.db.sqlalchemy import utils
-from nova.openstack.common import log as logging
 
-LOG = logging.getLogger(__name__)
 
 OLD_IDX_NAME = 'key_pair_user_id_name_idx'
 UC_NAME = 'key_pairs_uniq_name_and_user_id'
diff --git a/nova/db/sqlalchemy/migrate_repo/versions/175_add_project_user_id_to_volume_usage_cache.py b/nova/db/sqlalchemy/migrate_repo/versions/175_add_project_user_id_to_volume_usage_cache.py
index 73b21304a..581df60a0 100644
--- a/nova/db/sqlalchemy/migrate_repo/versions/175_add_project_user_id_to_volume_usage_cache.py
+++ b/nova/db/sqlalchemy/migrate_repo/versions/175_add_project_user_id_to_volume_usage_cache.py
@@ -16,10 +16,6 @@
 
 from sqlalchemy import MetaData, Integer, String, Table, Column
 
-from nova.openstack.common import log as logging
-
-LOG = logging.getLogger(__name__)
-
 
 def upgrade(migrate_engine):
     meta = MetaData()
diff --git a/nova/db/sqlalchemy/migration.py b/nova/db/sqlalchemy/migration.py
index 421167bec..14758ab2b 100644
--- a/nova/db/sqlalchemy/migration.py
+++ b/nova/db/sqlalchemy/migration.py
@@ -22,7 +22,6 @@ import os
 from nova.db import migration
 from nova import exception
 from nova.openstack.common.db.sqlalchemy import session as db_session
-from nova.openstack.common import log as logging
 
 
 import migrate
@@ -30,9 +29,6 @@ from migrate.versioning import util as migrate_util
 import sqlalchemy
 
 
-LOG = logging.getLogger(__name__)
-
-
 @migrate_util.decorator
 def patched_with_engine(f, *a, **kw):
     url = a[0]
diff --git a/nova/network/nova_ipam_lib.py b/nova/network/nova_ipam_lib.py
index 5fdb27900..301f3bd2e 100644
--- a/nova/network/nova_ipam_lib.py
+++ b/nova/network/nova_ipam_lib.py
@@ -17,10 +17,6 @@
 
 from nova import db
 from nova import ipv6
-from nova.openstack.common import log as logging
-
-
-LOG = logging.getLogger(__name__)
 
 
 def get_ipam_lib(net_man):
diff --git a/nova/network/sg.py b/nova/network/sg.py
index aad9f1052..1eac9aa97 100644
--- a/nova/network/sg.py
+++ b/nova/network/sg.py
@@ -27,11 +27,6 @@ will provide enhanced functionality and will be loadable via the
 security_group_handler flag.
 '''
 
-from nova.openstack.common import log as logging
-
-
-LOG = logging.getLogger(__name__)
-
 
 class SecurityGroupHandlerBase(object):
 
diff --git a/nova/scheduler/filters/__init__.py b/nova/scheduler/filters/__init__.py
index 720c2807a..1359913e1 100644
--- a/nova/scheduler/filters/__init__.py
+++ b/nova/scheduler/filters/__init__.py
@@ -18,9 +18,6 @@ Scheduler host filters
 """
 
 from nova import filters
-from nova.openstack.common import log as logging
-
-LOG = logging.getLogger(__name__)
 
 
 class BaseHostFilter(filters.BaseFilter):
diff --git a/nova/scheduler/weights/__init__.py b/nova/scheduler/weights/__init__.py
index 321bb42b8..e3c7a07e8 100644
--- a/nova/scheduler/weights/__init__.py
+++ b/nova/scheduler/weights/__init__.py
@@ -19,10 +19,8 @@ Scheduler host weights
 
 from oslo.config import cfg
 
-from nova.openstack.common import log as logging
 from nova import weights
 
-LOG = logging.getLogger(__name__)
 CONF = cfg.CONF
 
 
diff --git a/nova/test.py b/nova/test.py
index ac529534d..cc2466ff3 100644
--- a/nova/test.py
+++ b/nova/test.py
@@ -64,7 +64,6 @@ CONF.import_opt('sqlite_db', 'nova.openstack.common.db.sqlalchemy.session')
 CONF.set_override('use_stderr', False)
 
 logging.setup('nova')
-LOG = logging.getLogger(__name__)
 
 _DB_CACHE = None
 
diff --git a/nova/tests/api/ec2/test_cinder_cloud.py b/nova/tests/api/ec2/test_cinder_cloud.py
index c29f77daa..b3c816659 100644
--- a/nova/tests/api/ec2/test_cinder_cloud.py
+++ b/nova/tests/api/ec2/test_cinder_cloud.py
@@ -31,7 +31,6 @@ from nova.compute import utils as compute_utils
 from nova import context
 from nova import db
 from nova import exception
-from nova.openstack.common import log as logging
 from nova.openstack.common import rpc
 from nova import test
 from nova.tests import fake_network
@@ -43,7 +42,6 @@ CONF = cfg.CONF
 CONF.import_opt('compute_driver', 'nova.virt.driver')
 CONF.import_opt('default_instance_type', 'nova.compute.instance_types')
 CONF.import_opt('use_ipv6', 'nova.netconf')
-LOG = logging.getLogger(__name__)
 
 
 def get_fake_cache():
diff --git a/nova/tests/api/ec2/test_ec2_validate.py b/nova/tests/api/ec2/test_ec2_validate.py
index 9b67d67a1..359a8fee3 100644
--- a/nova/tests/api/ec2/test_ec2_validate.py
+++ b/nova/tests/api/ec2/test_ec2_validate.py
@@ -26,7 +26,6 @@ from nova.compute import utils as compute_utils
 from nova import context
 from nova import db
 from nova import exception
-from nova.openstack.common import log as logging
 from nova.openstack.common import rpc
 from nova.openstack.common import timeutils
 from nova import test
@@ -35,7 +34,6 @@ from nova.tests.image import fake
 
 CONF = cfg.CONF
 CONF.import_opt('compute_driver', 'nova.virt.driver')
-LOG = logging.getLogger(__name__)
 
 
 class EC2ValidateTestCase(test.TestCase):
diff --git a/nova/tests/api/openstack/compute/contrib/test_admin_actions_with_cells.py b/nova/tests/api/openstack/compute/contrib/test_admin_actions_with_cells.py
index 1e88d8047..0c5dea2c8 100644
--- a/nova/tests/api/openstack/compute/contrib/test_admin_actions_with_cells.py
+++ b/nova/tests/api/openstack/compute/contrib/test_admin_actions_with_cells.py
@@ -21,12 +21,10 @@ Tests For Compute admin api w/ Cells
 from nova.api.openstack.compute.contrib import admin_actions
 from nova.compute import cells_api as compute_cells_api
 from nova.compute import vm_states
-from nova.openstack.common import log as logging
 from nova.openstack.common import uuidutils
 from nova import test
 from nova.tests.api.openstack import fakes
 
-LOG = logging.getLogger('nova.tests.test_compute_cells')
 
 INSTANCE_IDS = {'inst_id': 1}
 
diff --git a/nova/tests/api/openstack/compute/contrib/test_aggregates.py b/nova/tests/api/openstack/compute/contrib/test_aggregates.py
index bb513bf7d..1f3c161d6 100644
--- a/nova/tests/api/openstack/compute/contrib/test_aggregates.py
+++ b/nova/tests/api/openstack/compute/contrib/test_aggregates.py
@@ -20,11 +20,9 @@ from webob import exc
 from nova.api.openstack.compute.contrib import aggregates
 from nova import context
 from nova import exception
-from nova.openstack.common import log as logging
 from nova import test
 from nova.tests import matchers
 
-LOG = logging.getLogger(__name__)
 AGGREGATE_LIST = [
         {"name": "aggregate1", "id": "1", "availability_zone": "nova1"},
         {"name": "aggregate2", "id": "2", "availability_zone": "nova1"},
diff --git a/nova/tests/api/openstack/compute/contrib/test_hosts.py b/nova/tests/api/openstack/compute/contrib/test_hosts.py
index 60e8f6e1f..326f0fd64 100644
--- a/nova/tests/api/openstack/compute/contrib/test_hosts.py
+++ b/nova/tests/api/openstack/compute/contrib/test_hosts.py
@@ -23,13 +23,10 @@ from nova.compute import vm_states
 from nova import context as context_maker
 from nova import db
 from nova import exception
-from nova.openstack.common import log as logging
 from nova import test
 from nova.tests import fake_hosts
 from nova.tests import utils
 
-LOG = logging.getLogger(__name__)
-
 
 def stub_service_get_all(context, disabled=None):
     return fake_hosts.SERVICES_LIST
diff --git a/nova/tests/api/openstack/compute/test_urlmap.py b/nova/tests/api/openstack/compute/test_urlmap.py
index 8cb98944c..b0ca5ed7c 100644
--- a/nova/tests/api/openstack/compute/test_urlmap.py
+++ b/nova/tests/api/openstack/compute/test_urlmap.py
@@ -16,13 +16,10 @@
 import webob
 
 from nova.openstack.common import jsonutils
-from nova.openstack.common import log as logging
 from nova import test
 from nova.tests.api.openstack import fakes
 import nova.tests.image.fake
 
-LOG = logging.getLogger(__name__)
-
 
 class UrlmapTest(test.TestCase):
     def setUp(self):
diff --git a/nova/tests/compute/test_claims.py b/nova/tests/compute/test_claims.py
index 42de11c09..e00b4bb24 100644
--- a/nova/tests/compute/test_claims.py
+++ b/nova/tests/compute/test_claims.py
@@ -20,11 +20,8 @@
 import uuid
 
 from nova.compute import claims
-from nova.openstack.common import log as logging
 from nova import test
 
-LOG = logging.getLogger(__name__)
-
 
 class DummyTracker(object):
     icalled = False
diff --git a/nova/tests/compute/test_compute_cells.py b/nova/tests/compute/test_compute_cells.py
index bafb3e920..952a557fb 100644
--- a/nova/tests/compute/test_compute_cells.py
+++ b/nova/tests/compute/test_compute_cells.py
@@ -25,13 +25,10 @@ from nova.compute import cells_api as compute_cells_api
 from nova import db
 from nova import exception
 from nova.openstack.common import jsonutils
-from nova.openstack.common import log as logging
 from nova import quota
 from nova.tests.compute import test_compute
 
 
-LOG = logging.getLogger('nova.tests.test_compute_cells')
-
 ORIG_COMPUTE_API = None
 cfg.CONF.import_opt('enable', 'nova.cells.opts', group='cells')
 
diff --git a/nova/tests/compute/test_compute_utils.py b/nova/tests/compute/test_compute_utils.py
index 2de9d0beb..52888c112 100644
--- a/nova/tests/compute/test_compute_utils.py
+++ b/nova/tests/compute/test_compute_utils.py
@@ -29,7 +29,6 @@ from nova import exception
 from nova.image import glance
 from nova.network import api as network_api
 from nova.openstack.common import importutils
-from nova.openstack.common import log as logging
 from nova.openstack.common.notifier import api as notifier_api
 from nova.openstack.common.notifier import test_notifier
 from nova import test
@@ -37,7 +36,6 @@ from nova.tests import fake_instance_actions
 from nova.tests import fake_network
 import nova.tests.image.fake
 
-LOG = logging.getLogger(__name__)
 CONF = cfg.CONF
 CONF.import_opt('compute_manager', 'nova.service')
 CONF.import_opt('compute_driver', 'nova.virt.driver')
diff --git a/nova/tests/compute/test_resource_tracker.py b/nova/tests/compute/test_resource_tracker.py
index c03ccbe28..aa4c5490d 100644
--- a/nova/tests/compute/test_resource_tracker.py
+++ b/nova/tests/compute/test_resource_tracker.py
@@ -27,13 +27,10 @@ from nova.compute import task_states
 from nova.compute import vm_states
 from nova import context
 from nova import db
-from nova.openstack.common import log as logging
 from nova.openstack.common import timeutils
 from nova import test
 from nova.virt import driver
 
-LOG = logging.getLogger(__name__)
-
 
 FAKE_VIRT_MEMORY_MB = 5
 FAKE_VIRT_LOCAL_GB = 6
diff --git a/nova/tests/consoleauth/test_consoleauth.py b/nova/tests/consoleauth/test_consoleauth.py
index 024434c0a..41bec05e1 100644
--- a/nova/tests/consoleauth/test_consoleauth.py
+++ b/nova/tests/consoleauth/test_consoleauth.py
@@ -22,12 +22,9 @@ Tests for Consoleauth Code.
 
 from nova.consoleauth import manager
 from nova import context
-from nova.openstack.common import log as logging
 from nova.openstack.common import timeutils
 from nova import test
 
-LOG = logging.getLogger(__name__)
-
 
 class ConsoleauthTestCase(test.TestCase):
     """Test Case for consoleauth."""
diff --git a/nova/tests/network/test_network_info.py b/nova/tests/network/test_network_info.py
index 021e6b5e6..960f3583a 100644
--- a/nova/tests/network/test_network_info.py
+++ b/nova/tests/network/test_network_info.py
@@ -17,12 +17,9 @@
 
 from nova import exception
 from nova.network import model
-from nova.openstack.common import log as logging
 from nova import test
 from nova.tests import fake_network_cache_model
 
-LOG = logging.getLogger(__name__)
-
 
 class RouteTests(test.TestCase):
     def test_create_route_with_attrs(self):
diff --git a/nova/tests/test_configdrive2.py b/nova/tests/test_configdrive2.py
index 28fa423e0..a71a01f8f 100644
--- a/nova/tests/test_configdrive2.py
+++ b/nova/tests/test_configdrive2.py
@@ -22,12 +22,9 @@ import tempfile
 
 from nova import test
 
-from nova.openstack.common import log
 from nova import utils
 from nova.virt import configdrive
 
-LOG = log.getLogger(__name__)
-
 
 class ConfigDriveTestCase(test.TestCase):
 
diff --git a/nova/tests/test_imagecache.py b/nova/tests/test_imagecache.py
index b225a2116..02cc7337a 100644
--- a/nova/tests/test_imagecache.py
+++ b/nova/tests/test_imagecache.py
@@ -39,8 +39,6 @@ CONF = cfg.CONF
 CONF.import_opt('compute_manager', 'nova.service')
 CONF.import_opt('host', 'nova.netconf')
 
-LOG = logging.getLogger(__name__)
-
 
 class ImageCacheManagerTestCase(test.TestCase):
 
diff --git a/nova/tests/test_instance_types.py b/nova/tests/test_instance_types.py
index 147ab25f7..5c8b4be14 100644
--- a/nova/tests/test_instance_types.py
+++ b/nova/tests/test_instance_types.py
@@ -23,11 +23,8 @@ from nova import db
 from nova.db.sqlalchemy import models
 from nova import exception
 from nova.openstack.common.db.sqlalchemy import session as sql_session
-from nova.openstack.common import log as logging
 from nova import test
 
-LOG = logging.getLogger(__name__)
-
 
 class InstanceTypeTestCase(test.TestCase):
     """Test cases for instance type code."""
diff --git a/nova/tests/test_ipv6.py b/nova/tests/test_ipv6.py
index df3d34c1f..6064b0185 100644
--- a/nova/tests/test_ipv6.py
+++ b/nova/tests/test_ipv6.py
@@ -17,11 +17,8 @@
 """Test suite for IPv6."""
 
 from nova import ipv6
-from nova.openstack.common import log as logging
 from nova import test
 
-LOG = logging.getLogger(__name__)
-
 
 class IPv6RFC2462TestCase(test.TestCase):
     """Unit tests for IPv6 rfc2462 backend operations."""
diff --git a/nova/tests/test_libvirt.py b/nova/tests/test_libvirt.py
index 1413eb98c..e26c25ff1 100644
--- a/nova/tests/test_libvirt.py
+++ b/nova/tests/test_libvirt.py
@@ -42,7 +42,6 @@ from nova import exception
 from nova.openstack.common import fileutils
 from nova.openstack.common import importutils
 from nova.openstack.common import jsonutils
-from nova.openstack.common import log as logging
 from nova.openstack.common import uuidutils
 from nova import test
 from nova.tests import fake_libvirt_utils
@@ -77,7 +76,6 @@ CONF.import_opt('compute_manager', 'nova.service')
 CONF.import_opt('host', 'nova.netconf')
 CONF.import_opt('my_ip', 'nova.netconf')
 CONF.import_opt('base_dir_name', 'nova.virt.libvirt.imagecache')
-LOG = logging.getLogger(__name__)
 
 _fake_network_info = fake_network.fake_get_instance_nw_info
 _fake_stub_out_get_nw_info = fake_network.stub_out_nw_api_get_instance_nw_info
diff --git a/nova/tests/test_notifications.py b/nova/tests/test_notifications.py
index 0c50d4933..68ef540b1 100644
--- a/nova/tests/test_notifications.py
+++ b/nova/tests/test_notifications.py
@@ -28,7 +28,6 @@ from nova import context
 from nova import db
 from nova.network import api as network_api
 from nova import notifications
-from nova.openstack.common import log as logging
 from nova.openstack.common.notifier import api as notifier_api
 from nova.openstack.common.notifier import test_notifier
 from nova import test
@@ -36,7 +35,6 @@ from nova.tests import fake_network
 
 CONF = cfg.CONF
 CONF.import_opt('compute_driver', 'nova.virt.driver')
-LOG = logging.getLogger(__name__)
 
 
 class NotificationsTestCase(test.TestCase):
diff --git a/nova/tests/test_powervm.py b/nova/tests/test_powervm.py
index 0ba9dce9a..572c0f946 100644
--- a/nova/tests/test_powervm.py
+++ b/nova/tests/test_powervm.py
@@ -28,7 +28,6 @@ from nova.compute import instance_types
 from nova.compute import power_state
 from nova.compute import task_states
 from nova.network import model as network_model
-from nova.openstack.common import log as logging
 from nova.tests import fake_network_cache_model
 from nova.tests.image import fake
 from nova.virt import images
@@ -39,8 +38,6 @@ from nova.virt.powervm import exception
 from nova.virt.powervm import lpar
 from nova.virt.powervm import operator
 
-LOG = logging.getLogger(__name__)
-
 
 def fake_lpar(instance_name):
     return lpar.LPAR(name=instance_name,
diff --git a/nova/virt/baremetal/db/sqlalchemy/api.py b/nova/virt/baremetal/db/sqlalchemy/api.py
index d117ad46d..2e1b8f291 100644
--- a/nova/virt/baremetal/db/sqlalchemy/api.py
+++ b/nova/virt/baremetal/db/sqlalchemy/api.py
@@ -29,14 +29,11 @@ import nova.context
 from nova.db.sqlalchemy import api as sqlalchemy_api
 from nova import exception
 from nova.openstack.common.db import exception as db_exc
-from nova.openstack.common import log as logging
 from nova.openstack.common import timeutils
 from nova.openstack.common import uuidutils
 from nova.virt.baremetal.db.sqlalchemy import models
 from nova.virt.baremetal.db.sqlalchemy import session as db_session
 
-LOG = logging.getLogger(__name__)
-
 
 def model_query(context, *args, **kwargs):
     """Query helper that accounts for context's `read_deleted` field.
diff --git a/nova/virt/baremetal/db/sqlalchemy/migrate_repo/versions/001_init.py b/nova/virt/baremetal/db/sqlalchemy/migrate_repo/versions/001_init.py
index fad83e21b..e4fc8e5ca 100644
--- a/nova/virt/baremetal/db/sqlalchemy/migrate_repo/versions/001_init.py
+++ b/nova/virt/baremetal/db/sqlalchemy/migrate_repo/versions/001_init.py
@@ -18,10 +18,6 @@
 from sqlalchemy import Boolean, Column, DateTime
 from sqlalchemy import Index, Integer, MetaData, String, Table
 
-from nova.openstack.common import log as logging
-
-LOG = logging.getLogger(__name__)
-
 
 def upgrade(migrate_engine):
     meta = MetaData()
diff --git a/nova/virt/baremetal/db/sqlalchemy/migration.py b/nova/virt/baremetal/db/sqlalchemy/migration.py
index cfc26c04c..3051b99df 100644
--- a/nova/virt/baremetal/db/sqlalchemy/migration.py
+++ b/nova/virt/baremetal/db/sqlalchemy/migration.py
@@ -23,12 +23,9 @@ import os
 import sqlalchemy
 
 from nova import exception
-from nova.openstack.common import log as logging
 from nova.virt.baremetal.db import migration
 from nova.virt.baremetal.db.sqlalchemy import session
 
-LOG = logging.getLogger(__name__)
-
 
 @migrate_util.decorator
 def patched_with_engine(f, *a, **kw):
diff --git a/nova/virt/baremetal/virtual_power_driver_settings.py b/nova/virt/baremetal/virtual_power_driver_settings.py
index e0df12242..781bf5bf9 100644
--- a/nova/virt/baremetal/virtual_power_driver_settings.py
+++ b/nova/virt/baremetal/virtual_power_driver_settings.py
@@ -18,11 +18,6 @@
 #
 # Virtual power driver commands
 
-from nova.openstack.common import log as logging
-
-
-LOG = logging.getLogger(__name__)
-
 
 class vbox(object):
     """set commands for basic Virtual Box control."""
diff --git a/nova/virt/hyperv/hostutils.py b/nova/virt/hyperv/hostutils.py
index d28ce75a5..9bfb79b55 100644
--- a/nova/virt/hyperv/hostutils.py
+++ b/nova/virt/hyperv/hostutils.py
@@ -22,10 +22,6 @@ import sys
 if sys.platform == 'win32':
     import wmi
 
-from nova.openstack.common import log as logging
-
-LOG = logging.getLogger(__name__)
-
 
 class HostUtils(object):
     def __init__(self):
diff --git a/nova/virt/hyperv/volumeutils.py b/nova/virt/hyperv/volumeutils.py
index 55604bd52..ec1ba1f1b 100644
--- a/nova/virt/hyperv/volumeutils.py
+++ b/nova/virt/hyperv/volumeutils.py
@@ -26,12 +26,10 @@ import time
 from eventlet.green import subprocess
 from oslo.config import cfg
 
-from nova.openstack.common import log as logging
 from nova import utils
 from nova.virt.hyperv import basevolumeutils
 from nova.virt.hyperv import vmutils
 
-LOG = logging.getLogger(__name__)
 CONF = cfg.CONF
 
 
diff --git a/nova/virt/hyperv/volumeutilsv2.py b/nova/virt/hyperv/volumeutilsv2.py
index 5fafe4c32..c92cac7f3 100644
--- a/nova/virt/hyperv/volumeutilsv2.py
+++ b/nova/virt/hyperv/volumeutilsv2.py
@@ -28,11 +28,9 @@ if sys.platform == 'win32':
 
 from oslo.config import cfg
 
-from nova.openstack.common import log as logging
 from nova import utils
 from nova.virt.hyperv import basevolumeutils
 
-LOG = logging.getLogger(__name__)
 CONF = cfg.CONF
 
 
diff --git a/nova/virt/libvirt/blockinfo.py b/nova/virt/libvirt/blockinfo.py
index fc39fc99d..8f1e72ab0 100644
--- a/nova/virt/libvirt/blockinfo.py
+++ b/nova/virt/libvirt/blockinfo.py
@@ -70,13 +70,10 @@ from oslo.config import cfg
 from nova import block_device
 from nova.compute import instance_types
 from nova import exception
-from nova.openstack.common import log as logging
 from nova.virt import configdrive
 from nova.virt import driver
 
 
-LOG = logging.getLogger(__name__)
-
 CONF = cfg.CONF
 
 
diff --git a/nova/virt/vmwareapi/vif.py b/nova/virt/vmwareapi/vif.py
index 4479a926f..4fd6611b5 100644
--- a/nova/virt/vmwareapi/vif.py
+++ b/nova/virt/vmwareapi/vif.py
@@ -20,12 +20,9 @@
 from oslo.config import cfg
 
 from nova import exception
-from nova.openstack.common import log as logging
 from nova.virt.vmwareapi import network_util
 
 
-LOG = logging.getLogger(__name__)
-
 CONF = cfg.CONF
 
 vmwareapi_vif_opts = [
diff --git a/nova/virt/xenapi/vif.py b/nova/virt/xenapi/vif.py
index 66c418e85..ed068c23f 100644
--- a/nova/virt/xenapi/vif.py
+++ b/nova/virt/xenapi/vif.py
@@ -21,7 +21,6 @@
 
 from oslo.config import cfg
 
-from nova.openstack.common import log as logging
 from nova.virt.xenapi import network_utils
 from nova.virt.xenapi import vm_utils
 
@@ -32,7 +31,6 @@ xenapi_ovs_integration_bridge_opt = cfg.StrOpt('xenapi_ovs_integration_bridge',
 
 CONF = cfg.CONF
 CONF.register_opt(xenapi_ovs_integration_bridge_opt)
-LOG = logging.getLogger(__name__)
 
 
 class XenVIFDriver(object):