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/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/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_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_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,