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

another fix.

Change-Id: I1ba743708dcb8e2c986bed38fbcf33f5bf18c60e
Closes-Bug: #1430662

common-powervc/powervc/common/config.py

@@ -9,7 +9,6 @@ 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
@@ -91,7 +90,6 @@ 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

@@ -38,6 +38,7 @@ from nova.openstack.common import service
 from oslo.utils import importutils
 
 CONF = glance_config.CONF
+log.register_options(CONF)
 
 LOG = log.getLogger(__name__)
 

nova-powervc/powervc/nova/cmd/compute.py

@@ -11,6 +11,7 @@ from nova import utils
 
 def main():
     CONF = config.CONF
+    log.register_options(CONF)
     try:
         config.parse_config(sys.argv, 'nova')
         log.setup(CONF, 'powervc')