From 3f2af18c03528d3be221d1f1f68544b18e4669d7 Mon Sep 17 00:00:00 2001 From: Jerry Cai Date: Tue, 10 Mar 2015 14:46:54 +0800 Subject: [PATCH] Rename nova.openstack.common.log to oslo_log.log Rename nova.openstack.common.log to oslo_log.log per openstack code change. Closes-Bug: #1430155 Change-Id: Idf9630734ad897d1a4a102edb8a24d17bdfb706b --- common-powervc/powervc/common/config.py | 2 ++ glance-powervc/bin/glance-powervc | 2 +- glance-powervc/powervc/glance/manager/manager.py | 2 +- nova-powervc/powervc/nova/cmd/compute.py | 4 ++-- nova-powervc/powervc/nova/driver/compute/computes.py | 2 +- nova-powervc/powervc/nova/driver/compute/manager.py | 2 +- nova-powervc/powervc/nova/driver/virt/powervc/driver.py | 2 +- nova-powervc/powervc/nova/driver/virt/powervc/rpcapi.py | 2 +- nova-powervc/powervc/nova/driver/virt/powervc/service.py | 2 +- .../powervc/nova/driver/virt/powervc/sync/flavorsync.py | 2 +- 10 files changed, 12 insertions(+), 10 deletions(-) diff --git a/common-powervc/powervc/common/config.py b/common-powervc/powervc/common/config.py index 5a78e1a..274940f 100644 --- a/common-powervc/powervc/common/config.py +++ b/common-powervc/powervc/common/config.py @@ -9,6 +9,7 @@ import sys from powervc.common import constants from oslo.config import cfg +from oslo_log import log if 'powervc' in sys.argv[0]: # Extract and remove --config-file amqp_openstack.conf and --config-file @@ -90,6 +91,7 @@ def parse_power_config(argv, base_project, base_prog=None): CONF(argv[1:], default_config_files=default_files) parse_power_config.power_config_loaded = True +log.register_options(CONF) FILE_OPTIONS = { '': [], 'openstack': [ diff --git a/glance-powervc/bin/glance-powervc b/glance-powervc/bin/glance-powervc index f424340..e350e7f 100644 --- a/glance-powervc/bin/glance-powervc +++ b/glance-powervc/bin/glance-powervc @@ -33,7 +33,7 @@ from powervc.common import config from powervc.glance.common import config as glance_config -from nova.openstack.common import log +from oslo_log import log from nova.openstack.common import service from oslo.utils import importutils diff --git a/glance-powervc/powervc/glance/manager/manager.py b/glance-powervc/powervc/glance/manager/manager.py index 078072e..fc7ead4 100644 --- a/glance-powervc/powervc/glance/manager/manager.py +++ b/glance-powervc/powervc/glance/manager/manager.py @@ -15,7 +15,7 @@ from operator import itemgetter from powervc.common import config from nova.openstack.common import service -from nova.openstack.common import log as logging +from oslo_log import log as logging from oslo.utils import timeutils from oslo.serialization import jsonutils from glanceclient.v1 import images as v1images diff --git a/nova-powervc/powervc/nova/cmd/compute.py b/nova-powervc/powervc/nova/cmd/compute.py index b80ffaf..e312976 100644 --- a/nova-powervc/powervc/nova/cmd/compute.py +++ b/nova-powervc/powervc/nova/cmd/compute.py @@ -4,7 +4,7 @@ import sys import traceback import powervc.nova.common.config as config -from nova.openstack.common import log +from oslo_log import log from nova import service from nova import utils @@ -13,7 +13,7 @@ def main(): CONF = config.CONF try: config.parse_config(sys.argv, 'nova') - log.setup('powervc') + log.setup(CONF, 'powervc') utils.monkey_patch() server = service.Service.create(manager=CONF.powervc.powervc_manager, binary='nova-powervc') diff --git a/nova-powervc/powervc/nova/driver/compute/computes.py b/nova-powervc/powervc/nova/driver/compute/computes.py index c7397bc..28e657b 100644 --- a/nova-powervc/powervc/nova/driver/compute/computes.py +++ b/nova-powervc/powervc/nova/driver/compute/computes.py @@ -14,7 +14,7 @@ import powervc.common.utils as commonutils from nova.compute import api from nova import context -from nova.openstack.common import log as logging +from oslo_log import log as logging from nova.openstack.common import loopingcall from oslo import messaging diff --git a/nova-powervc/powervc/nova/driver/compute/manager.py b/nova-powervc/powervc/nova/driver/compute/manager.py index f8006f1..d8539ff 100644 --- a/nova-powervc/powervc/nova/driver/compute/manager.py +++ b/nova-powervc/powervc/nova/driver/compute/manager.py @@ -26,7 +26,7 @@ from nova.compute import flavors from nova.compute import task_states from nova.compute import vm_states from oslo.utils import importutils -from nova.openstack.common import log as logging +from oslo_log import log as logging from oslo.utils import timeutils from nova.openstack.common import loopingcall from nova.openstack.common.loopingcall import LoopingCallDone diff --git a/nova-powervc/powervc/nova/driver/virt/powervc/driver.py b/nova-powervc/powervc/nova/driver/virt/powervc/driver.py index 272b28b..68b4dee 100644 --- a/nova-powervc/powervc/nova/driver/virt/powervc/driver.py +++ b/nova-powervc/powervc/nova/driver/virt/powervc/driver.py @@ -7,7 +7,7 @@ from nova.compute import task_states from nova.image import glance from nova.virt import driver from oslo.serialization import jsonutils -from nova.openstack.common import log as logging +from oslo_log import log as logging from oslo.utils import excutils from powervc.nova.driver.virt.powervc import service from powervc.nova.driver.compute import constants diff --git a/nova-powervc/powervc/nova/driver/virt/powervc/rpcapi.py b/nova-powervc/powervc/nova/driver/virt/powervc/rpcapi.py index 5764383..ca94a68 100644 --- a/nova-powervc/powervc/nova/driver/virt/powervc/rpcapi.py +++ b/nova-powervc/powervc/nova/driver/virt/powervc/rpcapi.py @@ -2,7 +2,7 @@ from nova import rpc from oslo.messaging import Target -from nova.openstack.common import log as logging +from oslo_log import log as logging from powervc.common.constants import PVC_TOPIC LOG = logging.getLogger(__name__) diff --git a/nova-powervc/powervc/nova/driver/virt/powervc/service.py b/nova-powervc/powervc/nova/driver/virt/powervc/service.py index 0537c7d..825921f 100644 --- a/nova-powervc/powervc/nova/driver/virt/powervc/service.py +++ b/nova-powervc/powervc/nova/driver/virt/powervc/service.py @@ -5,7 +5,7 @@ from novaclient import exceptions from nova import exception from nova.image import glance from nova.openstack.common import loopingcall -from nova.openstack.common import log as logging +from oslo_log import log as logging from nova.compute import vm_states from powervc.nova.common.exception import LiveMigrationException from powervc.nova.driver.compute import constants diff --git a/nova-powervc/powervc/nova/driver/virt/powervc/sync/flavorsync.py b/nova-powervc/powervc/nova/driver/virt/powervc/sync/flavorsync.py index a638836..88538d1 100644 --- a/nova-powervc/powervc/nova/driver/virt/powervc/sync/flavorsync.py +++ b/nova-powervc/powervc/nova/driver/virt/powervc/sync/flavorsync.py @@ -8,7 +8,7 @@ from powervc.common.gettextutils import _ from nova.compute import flavors from nova import exception from nova import db -from nova.openstack.common import log as logging +from oslo_log import log as logging from nova.openstack.common import loopingcall from powervc.nova.driver.compute import constants