Merge "Rename nova.openstack.common.log to oslo_log.log"

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': [

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
 

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

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')

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
 

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

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

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__)

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

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