Merge "Use oslo-config-2013.1b4"

bin/nova-all

@@ -33,6 +33,7 @@ eventlet.monkey_patch(os=False)
 import os
 import sys
 
+from oslo.config import cfg
 
 possible_topdir = os.path.normpath(os.path.join(os.path.abspath(
         sys.argv[0]), os.pardir, os.pardir))
@@ -42,7 +43,6 @@ if os.path.exists(os.path.join(possible_topdir, "nova", "__init__.py")):
 
 from nova import config
 from nova.objectstore import s3server
-from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
 from nova import service
 from nova import utils

bin/nova-api

@@ -29,6 +29,7 @@ eventlet.monkey_patch(os=False)
 import os
 import sys
 
+from oslo.config import cfg
 
 possible_topdir = os.path.normpath(os.path.join(os.path.abspath(
         sys.argv[0]), os.pardir, os.pardir))
@@ -37,7 +38,6 @@ if os.path.exists(os.path.join(possible_topdir, "nova", "__init__.py")):
 
 
 from nova import config
-from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
 from nova import service
 from nova import utils

bin/nova-baremetal-manage

@@ -58,6 +58,7 @@ import gettext
 import os
 import sys
 
+from oslo.config import cfg
 
 # If ../nova/__init__.py exists, add ../ to Python search path, so that
 # it will override what happens to be installed in /usr/(local/)lib/python...
@@ -70,7 +71,6 @@ if os.path.exists(os.path.join(POSSIBLE_TOPDIR, 'nova', '__init__.py')):
 gettext.install('nova', unicode=1)
 
 from nova import config
-from nova.openstack.common import cfg
 from nova.openstack.common import cliutils
 from nova.openstack.common import log as logging
 from nova import version

bin/nova-cells

@@ -24,6 +24,8 @@ eventlet.monkey_patch()
 import os
 import sys
 
+from oslo.config import cfg
+
 # If ../nova/__init__.py exists, add ../ to Python search path, so that
 # it will override what happens to be installed in /usr/(local/)lib/python...
 possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
@@ -33,7 +35,6 @@ if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
     sys.path.insert(0, possible_topdir)
 
 from nova import config
-from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
 from nova import service
 from nova import utils

bin/nova-cert

@@ -23,6 +23,8 @@ eventlet.monkey_patch()
 import os
 import sys
 
+from oslo.config import cfg
+
 # If ../nova/__init__.py exists, add ../ to Python search path, so that
 # it will override what happens to be installed in /usr/(local/)lib/python...
 POSSIBLE_TOPDIR = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
@@ -33,7 +35,6 @@ if os.path.exists(os.path.join(POSSIBLE_TOPDIR, 'nova', '__init__.py')):
 
 
 from nova import config
-from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
 from nova import service
 from nova import utils

bin/nova-clear-rabbit-queues

@@ -27,6 +27,8 @@ import gettext
 import os
 import sys
 
+from oslo.config import cfg
+
 # If ../nova/__init__.py exists, add ../ to Python search path, so that
 # it will override what happens to be installed in /usr/(local/)lib/python...
 POSSIBLE_TOPDIR = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
@@ -39,7 +41,6 @@ gettext.install('nova', unicode=1)
 
 
 from nova import config
-from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
 from nova.openstack.common import rpc
 

bin/nova-compute

@@ -33,6 +33,8 @@ import os
 import sys
 import traceback
 
+from oslo.config import cfg
+
 # If ../nova/__init__.py exists, add ../ to Python search path, so that
 # it will override what happens to be installed in /usr/(local/)lib/python...
 POSSIBLE_TOPDIR = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
@@ -45,7 +47,6 @@ if os.path.exists(os.path.join(POSSIBLE_TOPDIR, 'nova', '__init__.py')):
 from nova import config
 import nova.db.api
 from nova import exception
-from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
 from nova import service
 from nova import utils

bin/nova-conductor

@@ -23,6 +23,8 @@ eventlet.monkey_patch()
 import os
 import sys
 
+from oslo.config import cfg
+
 # If ../nova/__init__.py exists, add ../ to Python search path, so that
 # it will override what happens to be installed in /usr/(local/)lib/python...
 possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
@@ -33,7 +35,6 @@ if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
 
 
 from nova import config
-from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
 from nova import service
 from nova import utils

bin/nova-console

@@ -24,6 +24,8 @@ eventlet.monkey_patch()
 import os
 import sys
 
+from oslo.config import cfg
+
 # If ../nova/__init__.py exists, add ../ to Python search path, so that
 # it will override what happens to be installed in /usr/(local/)lib/python...
 possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
@@ -34,7 +36,6 @@ if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
 
 
 from nova import config
-from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
 from nova import service
 

bin/nova-consoleauth

@@ -24,6 +24,8 @@ eventlet.monkey_patch()
 import os
 import sys
 
+from oslo.config import cfg
+
 possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
                                    os.pardir,
                                    os.pardir))
@@ -33,7 +35,6 @@ if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
 
 from nova import config
 from nova.consoleauth import manager
-from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
 from nova import service
 

bin/nova-dhcpbridge

@@ -25,6 +25,8 @@ import gettext
 import os
 import sys
 
+from oslo.config import cfg
+
 # If ../nova/__init__.py exists, add ../ to Python search path, so that
 # it will override what happens to be installed in /usr/(local/)lib/python...
 possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
@@ -39,7 +41,6 @@ from nova import config
 from nova import context
 from nova import db
 from nova.network import rpcapi as network_rpcapi
-from nova.openstack.common import cfg
 from nova.openstack.common import importutils
 from nova.openstack.common import log as logging
 from nova.openstack.common import rpc

bin/nova-manage

@@ -59,6 +59,8 @@ import netaddr
 import os
 import sys
 
+from oslo.config import cfg
+
 # If ../nova/__init__.py exists, add ../ to Python search path, so that
 # it will override what happens to be installed in /usr/(local/)lib/python...
 POSSIBLE_TOPDIR = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
@@ -77,7 +79,6 @@ from nova import context
 from nova import db
 from nova.db import migration
 from nova import exception
-from nova.openstack.common import cfg
 from nova.openstack.common import cliutils
 from nova.openstack.common.db.sqlalchemy import session as db_session
 from nova.openstack.common import importutils

bin/nova-network

@@ -25,6 +25,8 @@ eventlet.monkey_patch()
 import os
 import sys
 
+from oslo.config import cfg
+
 # If ../nova/__init__.py exists, add ../ to Python search path, so that
 # it will override what happens to be installed in /usr/(local/)lib/python...
 possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
@@ -35,7 +37,6 @@ if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
 
 
 from nova import config
-from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
 from nova import service
 from nova import utils

bin/nova-novncproxy

@@ -24,9 +24,10 @@ noVNC consoles. Leverages websockify.py by Joel Martin
 import os
 import sys
 
+from oslo.config import cfg
+
 from nova import config
 from nova.console import websocketproxy
-from nova.openstack.common import cfg
 
 
 opts = [

bin/nova-rpc-zmq-receiver

@@ -22,6 +22,7 @@ import contextlib
 import os
 import sys
 
+from oslo.config import cfg
 import zmq
 
 # If ../nova/__init__.py exists, add ../ to Python search path, so that
@@ -34,7 +35,6 @@ if os.path.exists(os.path.join(POSSIBLE_TOPDIR, 'nova', '__init__.py')):
 
 from nova import config
 from nova import exception
-from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
 from nova.openstack.common import rpc
 from nova.openstack.common.rpc import impl_zmq

bin/nova-scheduler

@@ -26,6 +26,8 @@ import gettext
 import os
 import sys
 
+from oslo.config import cfg
+
 # If ../nova/__init__.py exists, add ../ to Python search path, so that
 # it will override what happens to be installed in /usr/(local/)lib/python...
 possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
@@ -37,7 +39,6 @@ if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
 gettext.install('nova', unicode=1)
 
 from nova import config
-from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
 from nova import service
 from nova import utils

bin/nova-spicehtml5proxy

@@ -24,9 +24,10 @@ SPICE HTML5 consoles. Leverages websockify.py by Joel Martin
 import os
 import sys
 
+from oslo.config import cfg
+
 from nova import config
 from nova.console import websocketproxy
-from nova.openstack.common import cfg
 
 
 opts = [

nova/common/memorycache.py

@@ -18,7 +18,8 @@
 
 """Super simple fake memcache client."""
 
-from nova.openstack.common import cfg
+from oslo.config import cfg
+
 from nova.openstack.common import timeutils
 
 memcache_opts = [

nova/scheduler/multi.py

@@ -27,7 +27,8 @@ schedule requests to compute nodes but provide their own manager and topic.
 https://bugs.launchpad.net/nova/+bug/1009681
 """
 
-from nova.openstack.common import cfg
+from oslo.config import cfg
+
 from nova.openstack.common import importutils
 from nova.scheduler import driver
 

nova/scheduler/rpcapi.py

@@ -18,7 +18,8 @@
 Client side of the scheduler manager RPC API.
 """
 
-from nova.openstack.common import cfg
+from oslo.config import cfg
+
 from nova.openstack.common import jsonutils
 import nova.openstack.common.rpc.proxy
 

nova/tests/baremetal/db/base.py

@@ -15,8 +15,9 @@
 
 """Bare-metal DB test base class."""
 
+from oslo.config import cfg
+
 from nova import context as nova_context
-from nova.openstack.common import cfg
 from nova import test
 from nova.virt.baremetal.db import migration as bm_migration
 from nova.virt.baremetal.db.sqlalchemy import session as bm_session

nova/tests/baremetal/test_driver.py

@@ -20,8 +20,9 @@
 
 """Tests for the base baremetal driver class."""
 
+from oslo.config import cfg
+
 from nova import exception
-from nova.openstack.common import cfg
 from nova import test
 from nova.tests.baremetal.db import base as bm_db_base
 from nova.tests.baremetal.db import utils as bm_db_utils

nova/tests/baremetal/test_ipmi.py

@@ -23,7 +23,8 @@ import os
 import stat
 import tempfile
 
-from nova.openstack.common import cfg
+from oslo.config import cfg
+
 from nova import test
 from nova.tests.baremetal.db import utils as bm_db_utils
 from nova import utils

nova/tests/baremetal/test_pxe.py

@@ -21,10 +21,10 @@
 
 import os
 
+from oslo.config import cfg
 from testtools import matchers
 
 from nova import exception
-from nova.openstack.common import cfg
 from nova.openstack.common.db.sqlalchemy import session as db_session
 from nova.tests.baremetal.db import base as bm_db_base
 from nova.tests.baremetal.db import utils as bm_db_utils

nova/tests/baremetal/test_virtual_power_driver.py

@@ -19,16 +19,14 @@
 """Tests for baremetal virtual power driver."""
 
 import mox
+from oslo.config import cfg
 
 from nova import exception
-from nova.openstack.common import cfg
-from nova import utils as nutils
-
 from nova.tests.baremetal.db import base as bm_db_base
 from nova.tests.baremetal.db import utils as bm_db_utils
 from nova.tests.image import fake as fake_image
 from nova.tests import utils
-
+from nova import utils as nutils
 from nova.virt.baremetal import db
 from nova.virt.baremetal import virtual_power_driver
 import nova.virt.powervm.common as connection

nova/tests/baremetal/test_volume_driver.py

@@ -15,9 +15,9 @@
 
 """Tests for baremetal volume driver."""
 
-from nova.openstack.common import cfg
-from nova import test
+from oslo.config import cfg
 
+from nova import test
 from nova.virt.baremetal import volume_driver
 
 CONF = cfg.CONF

nova/tests/fake_libvirt_utils.py

@@ -17,7 +17,8 @@
 import os
 import StringIO
 
-from nova.openstack.common import cfg
+from oslo.config import cfg
+
 from nova.virt.libvirt import utils as libvirt_utils
 
 

nova/tests/scheduler/test_least_cost.py

@@ -15,14 +15,15 @@
 """
 Tests For Least Cost functions.
 """
+
+from oslo.config import cfg
+
 from nova import context
-from nova.openstack.common import cfg
 from nova.scheduler import weights
 from nova.scheduler.weights import least_cost
 from nova import test
 from nova.tests.scheduler import fakes
 
-
 test_least_cost_opts = [
     cfg.FloatOpt('compute_fake_weigher1_weight',
              default=2.0,

nova/tests/scheduler/test_rpcapi.py

@@ -18,8 +18,9 @@
 Unit Tests for nova.scheduler.rpcapi
 """
 
+from oslo.config import cfg
+
 from nova import context
-from nova.openstack.common import cfg
 from nova.openstack.common import rpc
 from nova.scheduler import rpcapi as scheduler_rpcapi
 from nova import test

nova/tests/test_db_api.py

@@ -22,6 +22,7 @@
 import datetime
 import uuid as stdlib_uuid
 
+from oslo.config import cfg
 from sqlalchemy import MetaData
 from sqlalchemy.schema import Table
 from sqlalchemy.sql.expression import select
@@ -29,7 +30,6 @@ from sqlalchemy.sql.expression import select
 from nova import context
 from nova import db
 from nova import exception
-from nova.openstack.common import cfg
 from nova.openstack.common.db.sqlalchemy import session as db_session
 from nova.openstack.common import timeutils
 from nova import test

nova/tests/test_hypervapi.py

@@ -26,13 +26,14 @@ import shutil
 import time
 import uuid
 
+from oslo.config import cfg
+
 from nova.api.metadata import base as instance_metadata
 from nova.compute import power_state
 from nova.compute import task_states
 from nova import context
 from nova import db
 from nova.image import glance
-from nova.openstack.common import cfg
 from nova import test
 from nova.tests import fake_network
 from nova.tests.hyperv import db_fakes

nova/tests/test_imagebackend.py

@@ -15,10 +15,11 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import fixtures
 import os
 
-from nova.openstack.common import cfg
+import fixtures
+from oslo.config import cfg
+
 from nova.openstack.common import uuidutils
 from nova import test
 from nova.tests import fake_libvirt_utils

nova/tests/test_imagecache.py

@@ -24,14 +24,14 @@ import logging
 import os
 import time
 
-from nova import test
+from oslo.config import cfg
 
 from nova.compute import vm_states
 from nova import conductor
 from nova import db
-from nova.openstack.common import cfg
 from nova.openstack.common import importutils
 from nova.openstack.common import log
+from nova import test
 from nova import utils
 from nova.virt.libvirt import imagecache
 from nova.virt.libvirt import utils as virtutils

nova/tests/test_libvirt.py

@@ -27,6 +27,7 @@ import shutil
 import tempfile
 
 from lxml import etree
+from oslo.config import cfg
 from xml.dom import minidom
 
 from nova.api.ec2 import cloud
@@ -38,7 +39,6 @@ from nova.compute import vm_states
 from nova import context
 from nova import db
 from nova import exception
-from nova.openstack.common import cfg
 from nova.openstack.common import fileutils
 from nova.openstack.common import importutils
 from nova.openstack.common import jsonutils
@@ -64,7 +64,6 @@ from nova.virt.libvirt import firewall
 from nova.virt.libvirt import imagebackend
 from nova.virt.libvirt import utils as libvirt_utils
 
-
 try:
     import libvirt
 except ImportError:

nova/tests/test_libvirt_vif.py

@@ -15,10 +15,10 @@
 #    under the License.
 
 from lxml import etree
+from oslo.config import cfg
 
 from nova import exception
 from nova.network import model as network_model
-from nova.openstack.common import cfg
 from nova import test
 from nova.tests import fakelibvirt
 from nova import utils

nova/tests/test_libvirt_volume.py

@@ -17,8 +17,9 @@
 
 import os
 
+from oslo.config import cfg
+
 from nova import exception
-from nova.openstack.common import cfg
 from nova.storage import linuxscsi
 from nova import test
 from nova.tests import fake_libvirt_utils

nova/tests/test_xenapi.py

@@ -23,6 +23,8 @@ import functools
 import os
 import re
 
+from oslo.config import cfg
+
 from nova.compute import api as compute_api
 from nova.compute import instance_types
 from nova.compute import power_state
@@ -31,7 +33,6 @@ from nova.compute import vm_states
 from nova import context
 from nova import db
 from nova import exception
-from nova.openstack.common import cfg
 from nova.openstack.common import importutils
 from nova.openstack.common import jsonutils
 from nova.openstack.common import log as logging