Merge "Use oslo-config-2013.1b4"

23 files changed, 31 insertions, 29 deletions

diff --git a/nova/api/auth.py b/nova/api/auth.py
index 83388d638..04bb34066 100644
--- a/nova/api/auth.py
+++ b/nova/api/auth.py
@@ -18,11 +18,11 @@ Common Auth Middleware.
 
 """
 
+from oslo.config import cfg
 import webob.dec
 import webob.exc
 
 from nova import context
-from nova.openstack.common import cfg
 from nova.openstack.common import jsonutils
 from nova.openstack.common import log as logging
 from nova import wsgi
diff --git a/nova/api/ec2/__init__.py b/nova/api/ec2/__init__.py
index 85b87e3e5..397190fae 100644
--- a/nova/api/ec2/__init__.py
+++ b/nova/api/ec2/__init__.py
@@ -23,6 +23,7 @@ Starting point for routing EC2 requests.
 import urlparse
 
 from eventlet.green import httplib
+from oslo.config import cfg
 import webob
 import webob.dec
 import webob.exc
@@ -34,7 +35,6 @@ from nova.api import validator
 from nova.common import memorycache
 from nova import context
 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
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py
index b66b15852..03bf9f890 100644
--- a/nova/api/ec2/cloud.py
+++ b/nova/api/ec2/cloud.py
@@ -25,6 +25,8 @@ datastore.
 import base64
 import time
 
+from oslo.config import cfg
+
 from nova.api.ec2 import ec2utils
 from nova.api.ec2 import inst_state
 from nova.api.metadata import password
@@ -40,7 +42,6 @@ from nova import db
 from nova import exception
 from nova.image import s3
 from nova import network
-from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
 from nova.openstack.common import timeutils
 from nova import quota
diff --git a/nova/api/ec2/faults.py b/nova/api/ec2/faults.py
index 9299a946c..f13f26a77 100644
--- a/nova/api/ec2/faults.py
+++ b/nova/api/ec2/faults.py
@@ -12,11 +12,11 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo.config import cfg
 import webob.dec
 import webob.exc
 
 from nova import context
-from nova.openstack.common import cfg
 from nova import utils
 
 CONF = cfg.CONF
diff --git a/nova/api/metadata/base.py b/nova/api/metadata/base.py
index fca580b29..41f36541c 100644
--- a/nova/api/metadata/base.py
+++ b/nova/api/metadata/base.py
@@ -23,13 +23,14 @@ import json
 import os
 import posixpath
 
+from oslo.config import cfg
+
 from nova.api.ec2 import ec2utils
 from nova.api.metadata import password
 from nova import block_device
 from nova import conductor
 from nova import context
 from nova import network
-from nova.openstack.common import cfg
 from nova.openstack.common import timeutils
 from nova.virt import netutils
 
diff --git a/nova/api/metadata/handler.py b/nova/api/metadata/handler.py
index cedb27370..7cccbc324 100644
--- a/nova/api/metadata/handler.py
+++ b/nova/api/metadata/handler.py
@@ -21,6 +21,7 @@ import hashlib
 import hmac
 import os
 
+from oslo.config import cfg
 import webob.dec
 import webob.exc
 
@@ -28,7 +29,6 @@ from nova.api.metadata import base
 from nova.common import memorycache
 from nova import conductor
 from nova import exception
-from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
 from nova import wsgi
 
diff --git a/nova/api/openstack/auth.py b/nova/api/openstack/auth.py
index 24276b2bd..979aa74b6 100644
--- a/nova/api/openstack/auth.py
+++ b/nova/api/openstack/auth.py
@@ -17,12 +17,12 @@
 
 import os
 
+from oslo.config import cfg
 import webob.dec
 import webob.exc
 
 from nova.api.openstack import wsgi
 from nova import context
-from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
 from nova import wsgi as base_wsgi
 
diff --git a/nova/api/openstack/common.py b/nova/api/openstack/common.py
index 1f479b82e..8b880720b 100644
--- a/nova/api/openstack/common.py
+++ b/nova/api/openstack/common.py
@@ -20,6 +20,7 @@ import os
 import re
 import urlparse
 
+from oslo.config import cfg
 import webob
 
 from nova.api.openstack import wsgi
@@ -28,7 +29,6 @@ from nova.compute import task_states
 from nova.compute import utils as compute_utils
 from nova.compute import vm_states
 from nova import exception
-from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
 from nova import quota
 from nova import utils
diff --git a/nova/api/openstack/compute/__init__.py b/nova/api/openstack/compute/__init__.py
index 92c84c13f..6b05dcf5f 100644
--- a/nova/api/openstack/compute/__init__.py
+++ b/nova/api/openstack/compute/__init__.py
@@ -20,6 +20,8 @@
 WSGI middleware for OpenStack Compute API.
 """
 
+from oslo.config import cfg
+
 import nova.api.openstack
 from nova.api.openstack.compute import consoles
 from nova.api.openstack.compute import extensions
@@ -31,10 +33,8 @@ from nova.api.openstack.compute import limits
 from nova.api.openstack.compute import server_metadata
 from nova.api.openstack.compute import servers
 from nova.api.openstack.compute import versions
-from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
 
-
 LOG = logging.getLogger(__name__)
 
 allow_instance_snapshots_opt = cfg.BoolOpt('allow_instance_snapshots',
diff --git a/nova/api/openstack/compute/contrib/__init__.py b/nova/api/openstack/compute/contrib/__init__.py
index 7b21a0be8..8e1e8aa85 100644
--- a/nova/api/openstack/compute/contrib/__init__.py
+++ b/nova/api/openstack/compute/contrib/__init__.py
@@ -21,8 +21,9 @@ It can't be called 'extensions' because that causes namespacing problems.
 
 """
 
+from oslo.config import cfg
+
 from nova.api.openstack import extensions
-from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
 
 ext_opts = [
diff --git a/nova/api/openstack/compute/contrib/availability_zone.py b/nova/api/openstack/compute/contrib/availability_zone.py
index 98c508bd7..c79556839 100644
--- a/nova/api/openstack/compute/contrib/availability_zone.py
+++ b/nova/api/openstack/compute/contrib/availability_zone.py
@@ -14,17 +14,17 @@
 #    License for the specific language governing permissions and limitations
 #    under the License
 
+from oslo.config import cfg
+
 from nova.api.openstack import common
 from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
 from nova import availability_zones
 from nova import db
-from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
 from nova import servicegroup
 
-
 LOG = logging.getLogger(__name__)
 CONF = cfg.CONF
 
diff --git a/nova/api/openstack/compute/contrib/cells.py b/nova/api/openstack/compute/contrib/cells.py
index 29a9ffcc4..8e31777e2 100644
--- a/nova/api/openstack/compute/contrib/cells.py
+++ b/nova/api/openstack/compute/contrib/cells.py
@@ -16,9 +16,10 @@
 #    under the License.
 
 """The cells extension."""
-from xml.parsers import expat
 
+from oslo.config import cfg
 from webob import exc
+from xml.parsers import expat
 
 from nova.api.openstack import common
 from nova.api.openstack import extensions
@@ -28,7 +29,6 @@ from nova.cells import rpcapi as cells_rpcapi
 from nova.compute import api as compute
 from nova import db
 from nova import exception
-from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
 from nova.openstack.common import timeutils
 from nova import utils
diff --git a/nova/api/openstack/compute/contrib/cloudpipe.py b/nova/api/openstack/compute/contrib/cloudpipe.py
index 4e224be46..20ae87fe1 100644
--- a/nova/api/openstack/compute/contrib/cloudpipe.py
+++ b/nova/api/openstack/compute/contrib/cloudpipe.py
@@ -14,6 +14,8 @@
 
 """Connect your vlan to the world."""
 
+from oslo.config import cfg
+
 from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
@@ -24,7 +26,6 @@ from nova.compute import vm_states
 from nova import db
 from nova import exception
 from nova import network
-from nova.openstack.common import cfg
 from nova.openstack.common import fileutils
 from nova.openstack.common import log as logging
 from nova.openstack.common import timeutils
diff --git a/nova/api/openstack/compute/contrib/floating_ips_bulk.py b/nova/api/openstack/compute/contrib/floating_ips_bulk.py
index 11ab0ec69..afd42e12f 100644
--- a/nova/api/openstack/compute/contrib/floating_ips_bulk.py
+++ b/nova/api/openstack/compute/contrib/floating_ips_bulk.py
@@ -16,12 +16,12 @@
 #    under the License.
 
 import netaddr
+from oslo.config import cfg
 import webob.exc
 
 from nova.api.openstack import extensions
 from nova import db
 from nova import exception
-from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
 
 CONF = cfg.CONF
diff --git a/nova/api/openstack/compute/contrib/fping.py b/nova/api/openstack/compute/contrib/fping.py
index 282be19ca..394d5924e 100644
--- a/nova/api/openstack/compute/contrib/fping.py
+++ b/nova/api/openstack/compute/contrib/fping.py
@@ -19,17 +19,16 @@
 import itertools
 import os
 
+from oslo.config import cfg
 from webob import exc
 
 from nova.api.openstack import common
 from nova.api.openstack import extensions
 from nova import compute
 from nova import exception
-from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
 from nova import utils
 
-
 LOG = logging.getLogger(__name__)
 authorize = extensions.extension_authorizer('compute', 'fping')
 authorize_all_tenants = extensions.extension_authorizer(
diff --git a/nova/api/openstack/compute/contrib/hide_server_addresses.py b/nova/api/openstack/compute/contrib/hide_server_addresses.py
index bb8ee553a..4d8bcd94e 100644
--- a/nova/api/openstack/compute/contrib/hide_server_addresses.py
+++ b/nova/api/openstack/compute/contrib/hide_server_addresses.py
@@ -15,11 +15,11 @@
 
 """Extension for hiding server addresses in certain states."""
 
+from oslo.config import cfg
 
 from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova.compute import vm_states
-from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
 
 opts = [
diff --git a/nova/api/openstack/compute/contrib/instance_usage_audit_log.py b/nova/api/openstack/compute/contrib/instance_usage_audit_log.py
index 512b58869..d6ffe3677 100644
--- a/nova/api/openstack/compute/contrib/instance_usage_audit_log.py
+++ b/nova/api/openstack/compute/contrib/instance_usage_audit_log.py
@@ -18,11 +18,11 @@
 
 import datetime
 
+from oslo.config import cfg
 import webob.exc
 
 from nova.api.openstack import extensions
 from nova import compute
-from nova.openstack.common import cfg
 from nova import utils
 
 CONF = cfg.CONF
diff --git a/nova/api/openstack/compute/contrib/os_tenant_networks.py b/nova/api/openstack/compute/contrib/os_tenant_networks.py
index 03178ab65..9848d2320 100644
--- a/nova/api/openstack/compute/contrib/os_tenant_networks.py
+++ b/nova/api/openstack/compute/contrib/os_tenant_networks.py
@@ -18,13 +18,13 @@
 
 import netaddr
 import netaddr.core as netexc
+from oslo.config import cfg
 from webob import exc
 
 from nova.api.openstack import extensions
 from nova import context as nova_context
 from nova import exception
 import nova.network
-from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
 from nova import quota
 
diff --git a/nova/api/openstack/compute/contrib/rescue.py b/nova/api/openstack/compute/contrib/rescue.py
index 29135418e..c62ed5894 100644
--- a/nova/api/openstack/compute/contrib/rescue.py
+++ b/nova/api/openstack/compute/contrib/rescue.py
@@ -14,6 +14,7 @@
 
 """The rescue mode extension."""
 
+from oslo.config import cfg
 import webob
 from webob import exc
 
@@ -22,7 +23,6 @@ from nova.api.openstack import extensions as exts
 from nova.api.openstack import wsgi
 from nova import compute
 from nova import exception
-from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
 from nova import utils
 
diff --git a/nova/api/openstack/compute/contrib/services.py b/nova/api/openstack/compute/contrib/services.py
index 2786ad814..0f91bf13f 100644
--- a/nova/api/openstack/compute/contrib/services.py
+++ b/nova/api/openstack/compute/contrib/services.py
@@ -15,7 +15,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-
+from oslo.config import cfg
 import webob.exc
 
 from nova.api.openstack import extensions
@@ -24,12 +24,10 @@ from nova.api.openstack import xmlutil
 from nova import availability_zones
 from nova import db
 from nova import exception
-from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
 from nova.openstack.common import timeutils
 from nova import utils
 
-
 LOG = logging.getLogger(__name__)
 authorize = extensions.extension_authorizer('compute', 'services')
 CONF = cfg.CONF
diff --git a/nova/api/openstack/compute/extensions.py b/nova/api/openstack/compute/extensions.py
index 1d0738417..4e49482f5 100644
--- a/nova/api/openstack/compute/extensions.py
+++ b/nova/api/openstack/compute/extensions.py
@@ -15,8 +15,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo.config import cfg
+
 from nova.api.openstack import extensions as base_extensions
-from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
 from nova.openstack.common.plugin import pluginmanager
 
diff --git a/nova/api/openstack/compute/servers.py b/nova/api/openstack/compute/servers.py
index 3b8eb506d..cc33537af 100644
--- a/nova/api/openstack/compute/servers.py
+++ b/nova/api/openstack/compute/servers.py
@@ -19,6 +19,7 @@ import os
 import re
 import socket
 
+from oslo.config import cfg
 import webob
 from webob import exc
 
@@ -30,7 +31,6 @@ from nova.api.openstack import xmlutil
 from nova import compute
 from nova.compute import instance_types
 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.openstack.common.rpc import common as rpc_common
diff --git a/nova/api/sizelimit.py b/nova/api/sizelimit.py
index 77ab4415c..67d459583 100644
--- a/nova/api/sizelimit.py
+++ b/nova/api/sizelimit.py
@@ -18,10 +18,10 @@ Request Body limiting middleware.
 
 """
 
+from oslo.config import cfg
 import webob.dec
 import webob.exc
 
-from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
 from nova import wsgi