Merge "Use oslo-config-2013.1b4"

49 files changed, 89 insertions, 64 deletions

diff --git a/nova/virt/baremetal/db/api.py b/nova/virt/baremetal/db/api.py
index 002425333..672f14486 100644
--- a/nova/virt/baremetal/db/api.py
+++ b/nova/virt/baremetal/db/api.py
@@ -42,9 +42,9 @@ these objects be simple dictionaries.
 
 """
 
-from nova.openstack.common import cfg
-from nova import utils
+from oslo.config import cfg
 
+from nova import utils
 
 # NOTE(deva): we can't move baremetal_db_backend into an OptGroup yet
 #             because utils.LazyPluggable doesn't support reading from
diff --git a/nova/virt/baremetal/db/sqlalchemy/session.py b/nova/virt/baremetal/db/sqlalchemy/session.py
index 06d777354..585096c94 100644
--- a/nova/virt/baremetal/db/sqlalchemy/session.py
+++ b/nova/virt/baremetal/db/sqlalchemy/session.py
@@ -19,7 +19,8 @@
 
 """Session Handling for SQLAlchemy backend."""
 
-from nova.openstack.common import cfg
+from oslo.config import cfg
+
 from nova.openstack.common.db.sqlalchemy import session as nova_session
 from nova import paths
 
diff --git a/nova/virt/baremetal/driver.py b/nova/virt/baremetal/driver.py
index 9160485a6..379eaf04d 100755
--- a/nova/virt/baremetal/driver.py
+++ b/nova/virt/baremetal/driver.py
@@ -21,10 +21,11 @@
 A driver for Bare-metal platform.
 """
 
+from oslo.config import cfg
+
 from nova.compute import power_state
 from nova import context as nova_context
 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 importutils
 from nova.openstack.common import log as logging
diff --git a/nova/virt/baremetal/ipmi.py b/nova/virt/baremetal/ipmi.py
index 5d4a87625..7cc272c32 100644
--- a/nova/virt/baremetal/ipmi.py
+++ b/nova/virt/baremetal/ipmi.py
@@ -25,8 +25,9 @@ import os
 import stat
 import tempfile
 
+from oslo.config import cfg
+
 from nova import exception
-from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
 from nova import paths
 from nova import utils
diff --git a/nova/virt/baremetal/pxe.py b/nova/virt/baremetal/pxe.py
index 14bdab2b0..ce4060a5e 100644
--- a/nova/virt/baremetal/pxe.py
+++ b/nova/virt/baremetal/pxe.py
@@ -22,9 +22,10 @@ Class for PXE bare-metal nodes.
 
 import os
 
+from oslo.config import cfg
+
 from nova.compute import instance_types
 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 fileutils
 from nova.openstack.common import log as logging
@@ -32,7 +33,6 @@ from nova.virt.baremetal import base
 from nova.virt.baremetal import db
 from nova.virt.baremetal import utils as bm_utils
 
-
 pxe_opts = [
     cfg.StrOpt('deploy_kernel',
                help='Default kernel image ID used in deployment phase'),
diff --git a/nova/virt/baremetal/vif_driver.py b/nova/virt/baremetal/vif_driver.py
index 08e68c250..627155f9c 100644
--- a/nova/virt/baremetal/vif_driver.py
+++ b/nova/virt/baremetal/vif_driver.py
@@ -13,9 +13,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo.config import cfg
+
 from nova import context
 from nova import exception
-from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
 from nova.virt.baremetal import db as bmdb
 
diff --git a/nova/virt/baremetal/virtual_power_driver.py b/nova/virt/baremetal/virtual_power_driver.py
index f77579dba..a18a2f9d3 100644
--- a/nova/virt/baremetal/virtual_power_driver.py
+++ b/nova/virt/baremetal/virtual_power_driver.py
@@ -17,9 +17,9 @@
 #
 # Virtual power driver
 
+from oslo.config import cfg
 
 from nova import exception
-from nova.openstack.common import cfg
 from nova.openstack.common import importutils
 from nova.openstack.common import log as logging
 from nova import utils
diff --git a/nova/virt/baremetal/volume_driver.py b/nova/virt/baremetal/volume_driver.py
index e92325b97..cc23f9064 100644
--- a/nova/virt/baremetal/volume_driver.py
+++ b/nova/virt/baremetal/volume_driver.py
@@ -18,9 +18,10 @@
 
 import re
 
+from oslo.config import cfg
+
 from nova import context as nova_context
 from nova import exception
-from nova.openstack.common import cfg
 from nova.openstack.common import importutils
 from nova.openstack.common import log as logging
 from nova import utils
diff --git a/nova/virt/configdrive.py b/nova/virt/configdrive.py
index 886136460..658710e26 100644
--- a/nova/virt/configdrive.py
+++ b/nova/virt/configdrive.py
@@ -21,8 +21,9 @@ import os
 import shutil
 import tempfile
 
+from oslo.config import cfg
+
 from nova import exception
-from nova.openstack.common import cfg
 from nova.openstack.common import fileutils
 from nova.openstack.common import log as logging
 from nova import utils
diff --git a/nova/virt/disk/api.py b/nova/virt/disk/api.py
index d4f8b6cc0..0880af1cb 100644
--- a/nova/virt/disk/api.py
+++ b/nova/virt/disk/api.py
@@ -32,8 +32,9 @@ import tempfile
 if os.name != 'nt':
     import crypt
 
+from oslo.config import cfg
+
 from nova import exception
-from nova.openstack.common import cfg
 from nova.openstack.common import jsonutils
 from nova.openstack.common import log as logging
 from nova import paths
diff --git a/nova/virt/disk/mount/nbd.py b/nova/virt/disk/mount/nbd.py
index 72302fb91..d6414e96c 100644
--- a/nova/virt/disk/mount/nbd.py
+++ b/nova/virt/disk/mount/nbd.py
@@ -20,7 +20,8 @@ import random
 import re
 import time
 
-from nova.openstack.common import cfg
+from oslo.config import cfg
+
 from nova.openstack.common import log as logging
 from nova import utils
 from nova.virt.disk.mount import api
diff --git a/nova/virt/driver.py b/nova/virt/driver.py
index c0979c9d1..bc53aa88a 100755
--- a/nova/virt/driver.py
+++ b/nova/virt/driver.py
@@ -24,7 +24,8 @@ Driver base-classes:
 
 import sys
 
-from nova.openstack.common import cfg
+from oslo.config import cfg
+
 from nova.openstack.common import importutils
 from nova.openstack.common import log as logging
 from nova import utils
diff --git a/nova/virt/firewall.py b/nova/virt/firewall.py
index ad38cd9a4..6ab4249b1 100644
--- a/nova/virt/firewall.py
+++ b/nova/virt/firewall.py
@@ -17,16 +17,16 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo.config import cfg
+
 from nova import context
 from nova import network
 from nova.network import linux_net
-from nova.openstack.common import cfg
 from nova.openstack.common import importutils
 from nova.openstack.common import lockutils
 from nova.openstack.common import log as logging
 from nova.virt import netutils
 
-
 LOG = logging.getLogger(__name__)
 
 firewall_opts = [
diff --git a/nova/virt/hyperv/basevolumeutils.py b/nova/virt/hyperv/basevolumeutils.py
index 5b515a0f1..32221843f 100644
--- a/nova/virt/hyperv/basevolumeutils.py
+++ b/nova/virt/hyperv/basevolumeutils.py
@@ -28,8 +28,9 @@ if sys.platform == 'win32':
     import _winreg
     import wmi
 
+from oslo.config import cfg
+
 from nova import block_device
-from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
 from nova.virt import driver
 
diff --git a/nova/virt/hyperv/hostops.py b/nova/virt/hyperv/hostops.py
index b3b38aab9..4e5cfc6a4 100644
--- a/nova/virt/hyperv/hostops.py
+++ b/nova/virt/hyperv/hostops.py
@@ -21,7 +21,8 @@ Management class for host operations.
 import os
 import platform
 
-from nova.openstack.common import cfg
+from oslo.config import cfg
+
 from nova.openstack.common import jsonutils
 from nova.openstack.common import log as logging
 from nova.virt.hyperv import constants
diff --git a/nova/virt/hyperv/livemigrationops.py b/nova/virt/hyperv/livemigrationops.py
index 108413b0b..dca5de0cc 100644
--- a/nova/virt/hyperv/livemigrationops.py
+++ b/nova/virt/hyperv/livemigrationops.py
@@ -18,7 +18,8 @@
 """
 Management class for live migration VM operations.
 """
-from nova.openstack.common import cfg
+from oslo.config import cfg
+
 from nova.openstack.common import excutils
 from nova.openstack.common import log as logging
 from nova.virt.hyperv import imagecache
diff --git a/nova/virt/hyperv/pathutils.py b/nova/virt/hyperv/pathutils.py
index 05cfffaac..1297cd1ed 100644
--- a/nova/virt/hyperv/pathutils.py
+++ b/nova/virt/hyperv/pathutils.py
@@ -18,7 +18,8 @@
 import os
 import shutil
 
-from nova.openstack.common import cfg
+from oslo.config import cfg
+
 from nova.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
diff --git a/nova/virt/hyperv/snapshotops.py b/nova/virt/hyperv/snapshotops.py
index ab7c96943..5bed46665 100644
--- a/nova/virt/hyperv/snapshotops.py
+++ b/nova/virt/hyperv/snapshotops.py
@@ -20,9 +20,10 @@ Management class for VM snapshot operations.
 """
 import os
 
+from oslo.config import cfg
+
 from nova.compute import task_states
 from nova.image import glance
-from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
 from nova.virt.hyperv import pathutils
 from nova.virt.hyperv import vhdutils
diff --git a/nova/virt/hyperv/vif.py b/nova/virt/hyperv/vif.py
index cfe7c6a4c..d49441cee 100644
--- a/nova/virt/hyperv/vif.py
+++ b/nova/virt/hyperv/vif.py
@@ -18,12 +18,12 @@
 
 import abc
 
-from nova.openstack.common import cfg
+from oslo.config import cfg
+
 from nova.openstack.common import log as logging
 from nova.virt.hyperv import networkutils
 from nova.virt.hyperv import vmutils
 
-
 hyperv_opts = [
     cfg.StrOpt('vswitch_name',
                default=None,
diff --git a/nova/virt/hyperv/vmops.py b/nova/virt/hyperv/vmops.py
index c8acc0fa1..c7a4e5468 100644
--- a/nova/virt/hyperv/vmops.py
+++ b/nova/virt/hyperv/vmops.py
@@ -21,9 +21,10 @@ Management class for basic VM operations.
 """
 import os
 
+from oslo.config import cfg
+
 from nova.api.metadata import base as instance_metadata
 from nova import exception
-from nova.openstack.common import cfg
 from nova.openstack.common import excutils
 from nova.openstack.common import importutils
 from nova.openstack.common import log as logging
diff --git a/nova/virt/hyperv/vmutils.py b/nova/virt/hyperv/vmutils.py
index d80144b65..6536efe1e 100644
--- a/nova/virt/hyperv/vmutils.py
+++ b/nova/virt/hyperv/vmutils.py
@@ -27,8 +27,9 @@ import uuid
 if sys.platform == 'win32':
     import wmi
 
+from oslo.config import cfg
+
 from nova import exception
-from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
 from nova.virt.hyperv import constants
 
diff --git a/nova/virt/hyperv/volumeops.py b/nova/virt/hyperv/volumeops.py
index c665cbeb7..0d12b93a2 100644
--- a/nova/virt/hyperv/volumeops.py
+++ b/nova/virt/hyperv/volumeops.py
@@ -21,7 +21,8 @@ Management class for Storage-related functions (attach, detach, etc).
 """
 import time
 
-from nova.openstack.common import cfg
+from oslo.config import cfg
+
 from nova.openstack.common import log as logging
 from nova.virt import driver
 from nova.virt.hyperv import hostutils
diff --git a/nova/virt/hyperv/volumeutils.py b/nova/virt/hyperv/volumeutils.py
index 713ace258..6d623fca7 100644
--- a/nova/virt/hyperv/volumeutils.py
+++ b/nova/virt/hyperv/volumeutils.py
@@ -24,8 +24,8 @@ and storage repositories
 import time
 
 from eventlet.green import subprocess
+from oslo.config import cfg
 
-from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
 from nova.virt.hyperv import basevolumeutils
 from nova.virt.hyperv import vmutils
diff --git a/nova/virt/hyperv/volumeutilsv2.py b/nova/virt/hyperv/volumeutilsv2.py
index 8322d31d3..2dc86c2e0 100644
--- a/nova/virt/hyperv/volumeutilsv2.py
+++ b/nova/virt/hyperv/volumeutilsv2.py
@@ -26,7 +26,8 @@ import time
 if sys.platform == 'win32':
     import wmi
 
-from nova.openstack.common import cfg
+from oslo.config import cfg
+
 from nova.openstack.common import log as logging
 from nova.virt.hyperv import basevolumeutils
 
diff --git a/nova/virt/images.py b/nova/virt/images.py
index b5ca8fa47..50d89bfb8 100755
--- a/nova/virt/images.py
+++ b/nova/virt/images.py
@@ -24,13 +24,13 @@ Handling of VM disk images.
 import os
 import re
 
+from oslo.config import cfg
+
 from nova import exception
 from nova.image import glance
-from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
 from nova import utils
 
-
 LOG = logging.getLogger(__name__)
 
 image_opts = [
diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py
index 2a68b39bd..6f1cfef6f 100755
--- a/nova/virt/libvirt/driver.py
+++ b/nova/virt/libvirt/driver.py
@@ -59,6 +59,7 @@ from eventlet import patcher
 from eventlet import tpool
 from eventlet import util as eventlet_util
 from lxml import etree
+from oslo.config import cfg
 from xml.dom import minidom
 
 from nova.api.metadata import base as instance_metadata
@@ -69,7 +70,6 @@ from nova.compute import vm_mode
 from nova import context as nova_context
 from nova import exception
 from nova.image import glance
-from nova.openstack.common import cfg
 from nova.openstack.common import excutils
 from nova.openstack.common import fileutils
 from nova.openstack.common import importutils
diff --git a/nova/virt/libvirt/firewall.py b/nova/virt/libvirt/firewall.py
index c9a1b1fbb..054ec4c75 100644
--- a/nova/virt/libvirt/firewall.py
+++ b/nova/virt/libvirt/firewall.py
@@ -17,11 +17,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-
 from eventlet import tpool
+from oslo.config import cfg
 
 from nova.cloudpipe import pipelib
-from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
 import nova.virt.firewall as base_firewall
 
diff --git a/nova/virt/libvirt/imagebackend.py b/nova/virt/libvirt/imagebackend.py
index 92c42ce3e..082dd403e 100755
--- a/nova/virt/libvirt/imagebackend.py
+++ b/nova/virt/libvirt/imagebackend.py
@@ -19,7 +19,8 @@ import abc
 import contextlib
 import os
 
-from nova.openstack.common import cfg
+from oslo.config import cfg
+
 from nova.openstack.common import excutils
 from nova.openstack.common import fileutils
 from nova.openstack.common import lockutils
diff --git a/nova/virt/libvirt/imagecache.py b/nova/virt/libvirt/imagecache.py
index adc7691c6..d66d61415 100644
--- a/nova/virt/libvirt/imagecache.py
+++ b/nova/virt/libvirt/imagecache.py
@@ -28,9 +28,10 @@ import os
 import re
 import time
 
+from oslo.config import cfg
+
 from nova.compute import task_states
 from nova.compute import vm_states
-from nova.openstack.common import cfg
 from nova.openstack.common import fileutils
 from nova.openstack.common import jsonutils
 from nova.openstack.common import lockutils
@@ -38,7 +39,6 @@ from nova.openstack.common import log as logging
 from nova import utils
 from nova.virt.libvirt import utils as virtutils
 
-
 LOG = logging.getLogger(__name__)
 
 imagecache_opts = [
diff --git a/nova/virt/libvirt/utils.py b/nova/virt/libvirt/utils.py
index a20ab25e0..20af11ddc 100755
--- a/nova/virt/libvirt/utils.py
+++ b/nova/virt/libvirt/utils.py
@@ -23,9 +23,9 @@
 import os
 
 from lxml import etree
+from oslo.config import cfg
 
 from nova import exception
-from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
 from nova import utils
 from nova.virt import images
diff --git a/nova/virt/libvirt/vif.py b/nova/virt/libvirt/vif.py
index 000c77db9..4be8be33f 100644
--- a/nova/virt/libvirt/vif.py
+++ b/nova/virt/libvirt/vif.py
@@ -21,13 +21,13 @@
 
 import copy
 
+from oslo.config import cfg
+
 from nova import exception
 from nova.network import linux_net
 from nova.network import model as network_model
-from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
 from nova import utils
-
 from nova.virt.libvirt import config as vconfig
 from nova.virt.libvirt import designer
 
diff --git a/nova/virt/libvirt/volume.py b/nova/virt/libvirt/volume.py
index 035087caf..8fefeb41f 100644
--- a/nova/virt/libvirt/volume.py
+++ b/nova/virt/libvirt/volume.py
@@ -22,8 +22,9 @@ import hashlib
 import os
 import time
 
+from oslo.config import cfg
+
 from nova import exception
-from nova.openstack.common import cfg
 from nova.openstack.common import lockutils
 from nova.openstack.common import log as logging
 from nova import paths
diff --git a/nova/virt/netutils.py b/nova/virt/netutils.py
index 70f1544c4..eec2d6467 100644
--- a/nova/virt/netutils.py
+++ b/nova/virt/netutils.py
@@ -23,7 +23,7 @@
 
 import netaddr
 
-from nova.openstack.common import cfg
+from oslo.config import cfg
 
 CONF = cfg.CONF
 CONF.import_opt('use_ipv6', 'nova.netconf')
diff --git a/nova/virt/powervm/blockdev.py b/nova/virt/powervm/blockdev.py
index 580b6677a..58ad29099 100644
--- a/nova/virt/powervm/blockdev.py
+++ b/nova/virt/powervm/blockdev.py
@@ -18,8 +18,9 @@ import hashlib
 import os
 import re
 
+from oslo.config import cfg
+
 from nova.image import glance
-from nova.openstack.common import cfg
 from nova.openstack.common import excutils
 from nova.openstack.common import log as logging
 from nova import utils
diff --git a/nova/virt/powervm/driver.py b/nova/virt/powervm/driver.py
index 9cd6453ab..892ac34ef 100755
--- a/nova/virt/powervm/driver.py
+++ b/nova/virt/powervm/driver.py
@@ -17,13 +17,13 @@
 import socket
 import time
 
+from oslo.config import cfg
+
 from nova.image import glance
-from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
 from nova.virt import driver
 from nova.virt.powervm import operator
 
-
 LOG = logging.getLogger(__name__)
 
 powervm_opts = [
diff --git a/nova/virt/powervm/operator.py b/nova/virt/powervm/operator.py
index 03a13f261..2e276d4a3 100644
--- a/nova/virt/powervm/operator.py
+++ b/nova/virt/powervm/operator.py
@@ -19,14 +19,13 @@ import random
 import re
 import time
 
-from nova import exception as nova_exception
-from nova import utils
+from oslo.config import cfg
 
 from nova.compute import power_state
-from nova.openstack.common import cfg
+from nova import exception as nova_exception
 from nova.openstack.common import excutils
 from nova.openstack.common import log as logging
-
+from nova import utils
 from nova.virt.powervm import blockdev
 from nova.virt.powervm import command
 from nova.virt.powervm import common
@@ -34,7 +33,6 @@ from nova.virt.powervm import constants
 from nova.virt.powervm import exception
 from nova.virt.powervm import lpar as LPAR
 
-
 LOG = logging.getLogger(__name__)
 CONF = cfg.CONF
 
diff --git a/nova/virt/vmwareapi/driver.py b/nova/virt/vmwareapi/driver.py
index 63d9e3c57..5e48f4cd3 100755
--- a/nova/virt/vmwareapi/driver.py
+++ b/nova/virt/vmwareapi/driver.py
@@ -40,9 +40,9 @@ A connection to the VMware ESX platform.
 import time
 
 from eventlet import event
+from oslo.config import cfg
 
 from nova import exception
-from nova.openstack.common import cfg
 from nova.openstack.common import jsonutils
 from nova.openstack.common import log as logging
 from nova import utils
diff --git a/nova/virt/vmwareapi/vif.py b/nova/virt/vmwareapi/vif.py
index e2dfa0427..1a28ca35e 100644
--- a/nova/virt/vmwareapi/vif.py
+++ b/nova/virt/vmwareapi/vif.py
@@ -17,8 +17,9 @@
 
 """VIF drivers for VMware."""
 
+from oslo.config import cfg
+
 from nova import exception
-from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
 from nova.virt.vmwareapi import network_util
 
diff --git a/nova/virt/vmwareapi/vim.py b/nova/virt/vmwareapi/vim.py
index 83d120df5..f3a47315b 100644
--- a/nova/virt/vmwareapi/vim.py
+++ b/nova/virt/vmwareapi/vim.py
@@ -27,7 +27,8 @@ try:
 except ImportError:
     suds = None
 
-from nova.openstack.common import cfg
+from oslo.config import cfg
+
 from nova.virt.vmwareapi import error_util
 
 RESP_NOT_XML_ERROR = 'Response is "text/html", not "text/xml"'
diff --git a/nova/virt/vmwareapi/vmops.py b/nova/virt/vmwareapi/vmops.py
index 0aeb58ea3..b70d1583e 100644
--- a/nova/virt/vmwareapi/vmops.py
+++ b/nova/virt/vmwareapi/vmops.py
@@ -27,13 +27,14 @@ import urllib
 import urllib2
 import uuid
 
+from oslo.config import cfg
+
 from nova import block_device
 from nova.compute import api as compute
 from nova.compute import power_state
 from nova.compute import task_states
 from nova import context as nova_context
 from nova import exception
-from nova.openstack.common import cfg
 from nova.openstack.common import excutils
 from nova.openstack.common import log as logging
 from nova.virt import driver
diff --git a/nova/virt/vmwareapi/volumeops.py b/nova/virt/vmwareapi/volumeops.py
index 855106e4a..dd8f60f2a 100644
--- a/nova/virt/vmwareapi/volumeops.py
+++ b/nova/virt/vmwareapi/volumeops.py
@@ -18,14 +18,14 @@
 Management class for Storage-related functions (attach, detach, etc).
 """
 
+from oslo.config import cfg
+
 from nova import exception
-from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
 from nova.virt.vmwareapi import vim_util
 from nova.virt.vmwareapi import vm_util
 from nova.virt.vmwareapi import volume_util
 
-
 CONF = cfg.CONF
 LOG = logging.getLogger(__name__)
 
diff --git a/nova/virt/xenapi/agent.py b/nova/virt/xenapi/agent.py
index 8220fb67b..0be26a241 100644
--- a/nova/virt/xenapi/agent.py
+++ b/nova/virt/xenapi/agent.py
@@ -21,10 +21,11 @@ import os
 import time
 import uuid
 
+from oslo.config import cfg
+
 from nova.api.metadata import password
 from nova import context
 from nova import crypto
-from nova.openstack.common import cfg
 from nova.openstack.common import jsonutils
 from nova.openstack.common import log as logging
 from nova import utils
diff --git a/nova/virt/xenapi/driver.py b/nova/virt/xenapi/driver.py
index 6a1cdd6b9..347d36255 100755
--- a/nova/virt/xenapi/driver.py
+++ b/nova/virt/xenapi/driver.py
@@ -44,10 +44,10 @@ import xmlrpclib
 
 from eventlet import queue
 from eventlet import timeout
+from oslo.config import cfg
 
 from nova import context
 from nova import exception
-from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
 from nova.virt import driver
 from nova.virt.xenapi import host
diff --git a/nova/virt/xenapi/imageupload/glance.py b/nova/virt/xenapi/imageupload/glance.py
index adc06f65b..5ea75db16 100644
--- a/nova/virt/xenapi/imageupload/glance.py
+++ b/nova/virt/xenapi/imageupload/glance.py
@@ -13,8 +13,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo.config import cfg
+
 from nova.image import glance
-from nova.openstack.common import cfg
 import nova.openstack.common.log as logging
 from nova.virt.xenapi import vm_utils
 
diff --git a/nova/virt/xenapi/pool.py b/nova/virt/xenapi/pool.py
index 1682f18d1..ee39fb2da 100644
--- a/nova/virt/xenapi/pool.py
+++ b/nova/virt/xenapi/pool.py
@@ -21,9 +21,10 @@ Management class for Pool-related functions (join, eject, etc).
 
 import urlparse
 
+from oslo.config import cfg
+
 from nova.compute import rpcapi as compute_rpcapi
 from nova import exception
-from nova.openstack.common import cfg
 from nova.openstack.common import jsonutils
 from nova.openstack.common import log as logging
 from nova.virt.xenapi import pool_states
diff --git a/nova/virt/xenapi/vif.py b/nova/virt/xenapi/vif.py
index 35cdb201d..f0b9eebbe 100644
--- a/nova/virt/xenapi/vif.py
+++ b/nova/virt/xenapi/vif.py
@@ -19,7 +19,8 @@
 
 """VIF drivers for XenAPI."""
 
-from nova.openstack.common import cfg
+from oslo.config import cfg
+
 from nova.openstack.common import log as logging
 from nova.virt.xenapi import network_utils
 from nova.virt.xenapi import vm_utils
diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py
index 3bfe6de09..28e83198f 100644
--- a/nova/virt/xenapi/vm_utils.py
+++ b/nova/virt/xenapi/vm_utils.py
@@ -33,6 +33,7 @@ from xml.dom import minidom
 from xml.parsers import expat
 
 from eventlet import greenthread
+from oslo.config import cfg
 
 from nova.api.metadata import base as instance_metadata
 from nova import block_device
@@ -40,7 +41,6 @@ from nova.compute import power_state
 from nova.compute import task_states
 from nova import exception
 from nova.image import glance
-from nova.openstack.common import cfg
 from nova.openstack.common import excutils
 from nova.openstack.common import log as logging
 from nova import utils
diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py
index 5dbadc416..bf3f631b3 100644
--- a/nova/virt/xenapi/vmops.py
+++ b/nova/virt/xenapi/vmops.py
@@ -25,6 +25,7 @@ import time
 
 from eventlet import greenthread
 import netaddr
+from oslo.config import cfg
 
 from nova import block_device
 from nova.compute import api as compute
@@ -34,7 +35,6 @@ from nova.compute import vm_mode
 from nova.compute import vm_states
 from nova import context as nova_context
 from nova import exception
-from nova.openstack.common import cfg
 from nova.openstack.common import excutils
 from nova.openstack.common import importutils
 from nova.openstack.common import jsonutils
diff --git a/nova/virt/xenapi/volume_utils.py b/nova/virt/xenapi/volume_utils.py
index 40451a48e..edf92cee9 100644
--- a/nova/virt/xenapi/volume_utils.py
+++ b/nova/virt/xenapi/volume_utils.py
@@ -23,9 +23,9 @@ and storage repositories
 import re
 import string
 
-from nova.openstack.common import cfg
-from nova.openstack.common import log as logging
+from oslo.config import cfg
 
+from nova.openstack.common import log as logging
 
 CONF = cfg.CONF
 LOG = logging.getLogger(__name__)