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
This commit is contained in:
parent
a717ce4cec
commit
3f2af18c03
@ -9,6 +9,7 @@ import sys
|
|||||||
from powervc.common import constants
|
from powervc.common import constants
|
||||||
|
|
||||||
from oslo.config import cfg
|
from oslo.config import cfg
|
||||||
|
from oslo_log import log
|
||||||
|
|
||||||
if 'powervc' in sys.argv[0]:
|
if 'powervc' in sys.argv[0]:
|
||||||
# Extract and remove --config-file amqp_openstack.conf and --config-file
|
# 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)
|
CONF(argv[1:], default_config_files=default_files)
|
||||||
parse_power_config.power_config_loaded = True
|
parse_power_config.power_config_loaded = True
|
||||||
|
|
||||||
|
log.register_options(CONF)
|
||||||
FILE_OPTIONS = {
|
FILE_OPTIONS = {
|
||||||
'': [],
|
'': [],
|
||||||
'openstack': [
|
'openstack': [
|
||||||
|
@ -33,7 +33,7 @@ from powervc.common import config
|
|||||||
|
|
||||||
from powervc.glance.common import config as glance_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 nova.openstack.common import service
|
||||||
from oslo.utils import importutils
|
from oslo.utils import importutils
|
||||||
|
|
||||||
|
@ -15,7 +15,7 @@ from operator import itemgetter
|
|||||||
from powervc.common import config
|
from powervc.common import config
|
||||||
|
|
||||||
from nova.openstack.common import service
|
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.utils import timeutils
|
||||||
from oslo.serialization import jsonutils
|
from oslo.serialization import jsonutils
|
||||||
from glanceclient.v1 import images as v1images
|
from glanceclient.v1 import images as v1images
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
import sys
|
import sys
|
||||||
import traceback
|
import traceback
|
||||||
import powervc.nova.common.config as config
|
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 service
|
||||||
from nova import utils
|
from nova import utils
|
||||||
|
|
||||||
@ -13,7 +13,7 @@ def main():
|
|||||||
CONF = config.CONF
|
CONF = config.CONF
|
||||||
try:
|
try:
|
||||||
config.parse_config(sys.argv, 'nova')
|
config.parse_config(sys.argv, 'nova')
|
||||||
log.setup('powervc')
|
log.setup(CONF, 'powervc')
|
||||||
utils.monkey_patch()
|
utils.monkey_patch()
|
||||||
server = service.Service.create(manager=CONF.powervc.powervc_manager,
|
server = service.Service.create(manager=CONF.powervc.powervc_manager,
|
||||||
binary='nova-powervc')
|
binary='nova-powervc')
|
||||||
|
@ -14,7 +14,7 @@ import powervc.common.utils as commonutils
|
|||||||
from nova.compute import api
|
from nova.compute import api
|
||||||
from nova import context
|
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 nova.openstack.common import loopingcall
|
||||||
from oslo import messaging
|
from oslo import messaging
|
||||||
|
|
||||||
|
@ -26,7 +26,7 @@ from nova.compute import flavors
|
|||||||
from nova.compute import task_states
|
from nova.compute import task_states
|
||||||
from nova.compute import vm_states
|
from nova.compute import vm_states
|
||||||
from oslo.utils import importutils
|
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 oslo.utils import timeutils
|
||||||
from nova.openstack.common import loopingcall
|
from nova.openstack.common import loopingcall
|
||||||
from nova.openstack.common.loopingcall import LoopingCallDone
|
from nova.openstack.common.loopingcall import LoopingCallDone
|
||||||
|
@ -7,7 +7,7 @@ from nova.compute import task_states
|
|||||||
from nova.image import glance
|
from nova.image import glance
|
||||||
from nova.virt import driver
|
from nova.virt import driver
|
||||||
from oslo.serialization import jsonutils
|
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 oslo.utils import excutils
|
||||||
from powervc.nova.driver.virt.powervc import service
|
from powervc.nova.driver.virt.powervc import service
|
||||||
from powervc.nova.driver.compute import constants
|
from powervc.nova.driver.compute import constants
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
from nova import rpc
|
from nova import rpc
|
||||||
from oslo.messaging import Target
|
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
|
from powervc.common.constants import PVC_TOPIC
|
||||||
|
|
||||||
LOG = logging.getLogger(__name__)
|
LOG = logging.getLogger(__name__)
|
||||||
|
@ -5,7 +5,7 @@ from novaclient import exceptions
|
|||||||
from nova import exception
|
from nova import exception
|
||||||
from nova.image import glance
|
from nova.image import glance
|
||||||
from nova.openstack.common import loopingcall
|
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 nova.compute import vm_states
|
||||||
from powervc.nova.common.exception import LiveMigrationException
|
from powervc.nova.common.exception import LiveMigrationException
|
||||||
from powervc.nova.driver.compute import constants
|
from powervc.nova.driver.compute import constants
|
||||||
|
@ -8,7 +8,7 @@ from powervc.common.gettextutils import _
|
|||||||
from nova.compute import flavors
|
from nova.compute import flavors
|
||||||
from nova import exception
|
from nova import exception
|
||||||
from nova import db
|
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 nova.openstack.common import loopingcall
|
||||||
from powervc.nova.driver.compute import constants
|
from powervc.nova.driver.compute import constants
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user