Merge "Move cfg to nova.openstack.common"

14 files changed, 14 insertions, 14 deletions

diff --git a/nova/virt/disk/api.py b/nova/virt/disk/api.py
index 223f08a2f..929e17a55 100644
--- a/nova/virt/disk/api.py
+++ b/nova/virt/disk/api.py
@@ -29,10 +29,10 @@ import json
 import os
 import tempfile
 
-from nova.common import cfg
 from nova import exception
 from nova import flags
 from nova import log as logging
+from nova.openstack.common import cfg
 from nova import utils
 from nova.virt.disk import guestfs
 from nova.virt.disk import loop
diff --git a/nova/virt/disk/nbd.py b/nova/virt/disk/nbd.py
index 19904d694..d43fd3250 100644
--- a/nova/virt/disk/nbd.py
+++ b/nova/virt/disk/nbd.py
@@ -18,8 +18,8 @@
 import os
 import time
 
-from nova.common import cfg
 from nova import flags
+from nova.openstack.common import cfg
 from nova import utils
 from nova.virt.disk import mount
 
diff --git a/nova/virt/firewall.py b/nova/virt/firewall.py
index 2af28d7f1..48b02e545 100644
--- a/nova/virt/firewall.py
+++ b/nova/virt/firewall.py
@@ -17,11 +17,11 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from nova.common import cfg
 from nova import context
 from nova import db
 from nova import flags
 from nova import log as logging
+from nova.openstack.common import cfg
 from nova import utils
 from nova.virt import netutils
 
diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py
index 6c3e64692..45af96a0a 100644
--- a/nova/virt/libvirt/connection.py
+++ b/nova/virt/libvirt/connection.py
@@ -54,7 +54,6 @@ from xml.etree import ElementTree
 
 from nova.auth import manager
 from nova import block_device
-from nova.common import cfg
 from nova.compute import instance_types
 from nova.compute import power_state
 from nova import context as nova_context
@@ -63,6 +62,7 @@ from nova import exception
 from nova import flags
 import nova.image
 from nova import log as logging
+from nova.openstack.common import cfg
 from nova import utils
 from nova.virt.disk import api as disk
 from nova.virt import driver
diff --git a/nova/virt/libvirt/imagecache.py b/nova/virt/libvirt/imagecache.py
index a70842a3b..00c22ab49 100644
--- a/nova/virt/libvirt/imagecache.py
+++ b/nova/virt/libvirt/imagecache.py
@@ -29,13 +29,13 @@ import os
 import sys
 import time
 
-from nova.common import cfg
 from nova import compute
 from nova import context as db_context
 from nova import db
 from nova import flags
 from nova import image
 from nova import log as logging
+from nova.openstack.common import cfg
 from nova import utils
 from nova.virt.libvirt import utils as virtutils
 
diff --git a/nova/virt/libvirt/utils.py b/nova/virt/libvirt/utils.py
index 65254936a..4409e6aa6 100644
--- a/nova/virt/libvirt/utils.py
+++ b/nova/virt/libvirt/utils.py
@@ -23,9 +23,9 @@ import os
 import random
 import shutil
 
-from nova.common import cfg
 from nova import exception
 from nova import flags
+from nova.openstack.common import cfg
 from nova import utils
 from nova.virt.disk import api as disk
 from nova.virt import images
diff --git a/nova/virt/libvirt/vif.py b/nova/virt/libvirt/vif.py
index 503c33d0f..54bc742f8 100644
--- a/nova/virt/libvirt/vif.py
+++ b/nova/virt/libvirt/vif.py
@@ -19,11 +19,11 @@
 
 """VIF drivers for libvirt."""
 
-from nova.common import cfg
 from nova import exception
 from nova import flags
 from nova import log as logging
 from nova.network import linux_net
+from nova.openstack.common import cfg
 from nova import utils
 from nova.virt import netutils
 from nova.virt.vif import VIFDriver
diff --git a/nova/virt/vmwareapi/vim.py b/nova/virt/vmwareapi/vim.py
index 0ce1be645..648231087 100644
--- a/nova/virt/vmwareapi/vim.py
+++ b/nova/virt/vmwareapi/vim.py
@@ -26,8 +26,8 @@ try:
 except ImportError:
     suds = None
 
-from nova.common import cfg
 from nova import flags
+from nova.openstack.common 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 172936def..af867dc6a 100644
--- a/nova/virt/vmwareapi/vmops.py
+++ b/nova/virt/vmwareapi/vmops.py
@@ -26,11 +26,11 @@ import urllib
 import urllib2
 import uuid
 
-from nova.common import cfg
 from nova.compute import power_state
 from nova import exception
 from nova import flags
 from nova import log as logging
+from nova.openstack.common import cfg
 from nova import utils
 from nova.virt.vmwareapi import vim_util
 from nova.virt.vmwareapi import vm_util
diff --git a/nova/virt/vmwareapi_conn.py b/nova/virt/vmwareapi_conn.py
index d71b922c9..c63f1e9d5 100644
--- a/nova/virt/vmwareapi_conn.py
+++ b/nova/virt/vmwareapi_conn.py
@@ -36,12 +36,12 @@ import time
 
 from eventlet import event
 
-from nova.common import cfg
 from nova import context
 from nova import db
 from nova import exception
 from nova import flags
 from nova import log as logging
+from nova.openstack.common import cfg
 from nova import utils
 from nova.virt import driver
 from nova.virt.vmwareapi import error_util
diff --git a/nova/virt/xenapi/vif.py b/nova/virt/xenapi/vif.py
index c1b752d5a..e4a5ea973 100644
--- a/nova/virt/xenapi/vif.py
+++ b/nova/virt/xenapi/vif.py
@@ -19,9 +19,9 @@
 
 """VIF drivers for XenAPI."""
 
-from nova.common import cfg
 from nova import flags
 from nova import log as logging
+from nova.openstack.common import cfg
 from nova.virt.vif import VIFDriver
 from nova.virt.xenapi.network_utils import NetworkHelper
 from nova.virt.xenapi.vm_utils import VMHelper
diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py
index 9ddf8b22a..169bb2b61 100644
--- a/nova/virt/xenapi/vm_utils.py
+++ b/nova/virt/xenapi/vm_utils.py
@@ -33,11 +33,11 @@ import uuid
 from decimal import Decimal, InvalidOperation
 from xml.dom import minidom
 
-from nova.common import cfg
 from nova import exception
 from nova import flags
 from nova.image import glance
 from nova import log as logging
+from nova.openstack.common import cfg
 from nova import utils
 from nova.compute import instance_types
 from nova.compute import power_state
diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py
index 139eb3262..17f658f8e 100644
--- a/nova/virt/xenapi/vmops.py
+++ b/nova/virt/xenapi/vmops.py
@@ -31,7 +31,6 @@ import uuid
 
 from eventlet import greenthread
 
-from nova.common import cfg
 from nova.compute import api as compute
 from nova.compute import power_state
 from nova import context as nova_context
@@ -39,6 +38,7 @@ from nova import db
 from nova import exception
 from nova import flags
 from nova import log as logging
+from nova.openstack.common import cfg
 from nova import utils
 from nova.virt import driver
 from nova.virt.xenapi import volume_utils
diff --git a/nova/virt/xenapi_conn.py b/nova/virt/xenapi_conn.py
index 6fda205d0..236bd4762 100644
--- a/nova/virt/xenapi_conn.py
+++ b/nova/virt/xenapi_conn.py
@@ -70,13 +70,13 @@ from eventlet import queue
 from eventlet import tpool
 from eventlet import timeout
 
-from nova.common import cfg
 from nova import context
 from nova import db
 from nova import exception
 from nova import utils
 from nova import flags
 from nova import log as logging
+from nova.openstack.common import cfg
 from nova.virt import driver
 from nova.virt.xenapi import vm_utils
 from nova.virt.xenapi.vmops import VMOps