Merge "Use CONF.import_opt() for nova.config opts"

15 files changed, 26 insertions, 15 deletions

diff --git a/nova/api/auth.py b/nova/api/auth.py
index b00be750d..c51d4d0db 100644
--- a/nova/api/auth.py
+++ b/nova/api/auth.py
@@ -21,7 +21,6 @@ Common Auth Middleware.
 import webob.dec
 import webob.exc
 
-from nova import config
 from nova import context
 from nova.openstack.common import cfg
 from nova.openstack.common import jsonutils
@@ -36,6 +35,8 @@ use_forwarded_for_opt = cfg.BoolOpt('use_forwarded_for',
 
 CONF = cfg.CONF
 CONF.register_opt(use_forwarded_for_opt)
+CONF.import_opt('api_rate_limit', 'nova.config')
+CONF.import_opt('auth_strategy', 'nova.config')
 LOG = logging.getLogger(__name__)
 
 
diff --git a/nova/api/ec2/__init__.py b/nova/api/ec2/__init__.py
index 58c8c5d52..28b946a8b 100644
--- a/nova/api/ec2/__init__.py
+++ b/nova/api/ec2/__init__.py
@@ -31,7 +31,6 @@ from nova.api.ec2 import apirequest
 from nova.api.ec2 import ec2utils
 from nova.api.ec2 import faults
 from nova.api import validator
-from nova import config
 from nova import context
 from nova import exception
 from nova.openstack.common import cfg
@@ -73,6 +72,7 @@ ec2_opts = [
 
 CONF = cfg.CONF
 CONF.register_opts(ec2_opts)
+CONF.import_opt('memcached_servers', 'nova.config')
 CONF.import_opt('use_forwarded_for', 'nova.api.auth')
 
 
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py
index 1c43661bb..aca4ab3b2 100644
--- a/nova/api/ec2/cloud.py
+++ b/nova/api/ec2/cloud.py
@@ -33,7 +33,6 @@ from nova import compute
 from nova.compute import api as compute_api
 from nova.compute import instance_types
 from nova.compute import vm_states
-from nova import config
 from nova import db
 from nova import exception
 from nova.image import s3
@@ -47,6 +46,13 @@ from nova import volume
 
 
 CONF = cfg.CONF
+CONF.import_opt('ec2_host', 'nova.config')
+CONF.import_opt('ec2_path', 'nova.config')
+CONF.import_opt('ec2_port', 'nova.config')
+CONF.import_opt('ec2_scheme', 'nova.config')
+CONF.import_opt('region_list', 'nova.config')
+CONF.import_opt('vpn_image_id', 'nova.config')
+CONF.import_opt('vpn_key_suffix', 'nova.config')
 
 LOG = logging.getLogger(__name__)
 
diff --git a/nova/api/manager.py b/nova/api/manager.py
index a3fae4c10..04607d751 100644
--- a/nova/api/manager.py
+++ b/nova/api/manager.py
@@ -16,12 +16,12 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from nova import config
 from nova import manager
 from nova.openstack.common import cfg
 from nova.openstack.common import importutils
 
 CONF = cfg.CONF
+CONF.import_opt('network_driver', 'nova.config')
 
 
 class MetadataManager(manager.Manager):
diff --git a/nova/api/metadata/handler.py b/nova/api/metadata/handler.py
index cca883405..bbf1f9318 100644
--- a/nova/api/metadata/handler.py
+++ b/nova/api/metadata/handler.py
@@ -23,13 +23,13 @@ import webob.dec
 import webob.exc
 
 from nova.api.metadata import base
-from nova import config
 from nova import exception
 from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
 from nova import wsgi
 
 CONF = cfg.CONF
+CONF.import_opt('memcached_servers', 'nova.config')
 CONF.import_opt('use_forwarded_for', 'nova.api.auth')
 
 LOG = logging.getLogger(__name__)
diff --git a/nova/api/openstack/common.py b/nova/api/openstack/common.py
index 877fedaa8..c3d0c2f94 100644
--- a/nova/api/openstack/common.py
+++ b/nova/api/openstack/common.py
@@ -28,7 +28,6 @@ from nova.api.openstack import xmlutil
 from nova.compute import task_states
 from nova.compute import utils as compute_utils
 from nova.compute import vm_states
-from nova import config
 from nova import exception
 from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
@@ -37,6 +36,8 @@ from nova import quota
 
 LOG = logging.getLogger(__name__)
 CONF = cfg.CONF
+CONF.import_opt('osapi_compute_link_prefix', 'nova.config')
+CONF.import_opt('osapi_max_limit', 'nova.config')
 QUOTAS = quota.QUOTAS
 
 
diff --git a/nova/api/openstack/compute/contrib/__init__.py b/nova/api/openstack/compute/contrib/__init__.py
index de912d6d8..ec09ae941 100644
--- a/nova/api/openstack/compute/contrib/__init__.py
+++ b/nova/api/openstack/compute/contrib/__init__.py
@@ -22,12 +22,12 @@ It can't be called 'extensions' because that causes namespacing problems.
 """
 
 from nova.api.openstack import extensions
-from nova import config
 from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
 
 
 CONF = cfg.CONF
+CONF.import_opt('osapi_compute_ext_list', 'nova.config')
 LOG = logging.getLogger(__name__)
 
 
diff --git a/nova/api/openstack/compute/contrib/cloudpipe.py b/nova/api/openstack/compute/contrib/cloudpipe.py
index c41052ef1..1b60f6c1f 100644
--- a/nova/api/openstack/compute/contrib/cloudpipe.py
+++ b/nova/api/openstack/compute/contrib/cloudpipe.py
@@ -21,7 +21,6 @@ from nova.cloudpipe import pipelib
 from nova import compute
 from nova.compute import utils as compute_utils
 from nova.compute import vm_states
-from nova import config
 from nova import db
 from nova import exception
 from nova import network
@@ -32,6 +31,7 @@ from nova.openstack.common import timeutils
 from nova import utils
 
 CONF = cfg.CONF
+CONF.import_opt('vpn_image_id', 'nova.config')
 LOG = logging.getLogger(__name__)
 authorize = extensions.extension_authorizer('compute', 'cloudpipe')
 
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 825d14433..bec9261ab 100644
--- a/nova/api/openstack/compute/contrib/instance_usage_audit_log.py
+++ b/nova/api/openstack/compute/contrib/instance_usage_audit_log.py
@@ -21,12 +21,12 @@ import datetime
 import webob.exc
 
 from nova.api.openstack import extensions
-from nova import config
 from nova import db
 from nova.openstack.common import cfg
 from nova import utils
 
 CONF = cfg.CONF
+CONF.import_opt('compute_topic', 'nova.config')
 
 
 authorize = extensions.extension_authorizer('compute',
diff --git a/nova/api/openstack/compute/contrib/rescue.py b/nova/api/openstack/compute/contrib/rescue.py
index 02a961c22..8aff90c38 100644
--- a/nova/api/openstack/compute/contrib/rescue.py
+++ b/nova/api/openstack/compute/contrib/rescue.py
@@ -21,7 +21,6 @@ from nova.api.openstack import common
 from nova.api.openstack import extensions as exts
 from nova.api.openstack import wsgi
 from nova import compute
-from nova import config
 from nova import exception
 from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
@@ -29,6 +28,7 @@ from nova import utils
 
 
 CONF = cfg.CONF
+CONF.import_opt('password_length', 'nova.config')
 LOG = logging.getLogger(__name__)
 authorize = exts.extension_authorizer('compute', 'rescue')
 
diff --git a/nova/api/openstack/compute/contrib/services.py b/nova/api/openstack/compute/contrib/services.py
index 793395b0b..3114c3ae4 100644
--- a/nova/api/openstack/compute/contrib/services.py
+++ b/nova/api/openstack/compute/contrib/services.py
@@ -21,7 +21,6 @@ import webob.exc
 from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
-from nova import config
 from nova import db
 from nova import exception
 from nova.openstack.common import cfg
@@ -33,6 +32,7 @@ from nova import utils
 LOG = logging.getLogger(__name__)
 authorize = extensions.extension_authorizer('compute', 'services')
 CONF = cfg.CONF
+CONF.import_opt('service_down_time', 'nova.config')
 
 
 class ServicesIndexTemplate(xmlutil.TemplateBuilder):
diff --git a/nova/api/openstack/compute/extensions.py b/nova/api/openstack/compute/extensions.py
index c92f8b19f..d3c31daca 100644
--- a/nova/api/openstack/compute/extensions.py
+++ b/nova/api/openstack/compute/extensions.py
@@ -16,7 +16,6 @@
 #    under the License.
 
 from nova.api.openstack import extensions as base_extensions
-from nova import config
 from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
 from nova.openstack.common.plugin import pluginmanager
@@ -24,6 +23,7 @@ from nova.openstack.common.plugin import pluginmanager
 
 LOG = logging.getLogger(__name__)
 CONF = cfg.CONF
+CONF.import_opt('osapi_compute_extension', 'nova.config')
 
 
 class ExtensionManager(base_extensions.ExtensionManager):
diff --git a/nova/api/openstack/compute/servers.py b/nova/api/openstack/compute/servers.py
index e105969dd..1b758f23f 100644
--- a/nova/api/openstack/compute/servers.py
+++ b/nova/api/openstack/compute/servers.py
@@ -30,7 +30,6 @@ from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
 from nova import compute
 from nova.compute import instance_types
-from nova import config
 from nova import exception
 from nova.openstack.common import cfg
 from nova.openstack.common import importutils
@@ -43,6 +42,10 @@ from nova import utils
 
 LOG = logging.getLogger(__name__)
 CONF = cfg.CONF
+CONF.import_opt('enable_instance_password', 'nova.config')
+CONF.import_opt('network_api_class', 'nova.config')
+CONF.import_opt('password_length', 'nova.config')
+CONF.import_opt('reclaim_instance_interval', 'nova.config')
 
 
 def make_fault(elem):
diff --git a/nova/api/openstack/compute/views/images.py b/nova/api/openstack/compute/views/images.py
index cf6733431..84326f356 100644
--- a/nova/api/openstack/compute/views/images.py
+++ b/nova/api/openstack/compute/views/images.py
@@ -18,11 +18,11 @@
 import os.path
 
 from nova.api.openstack import common
-from nova import config
 from nova.openstack.common import cfg
 from nova import utils
 
 CONF = cfg.CONF
+CONF.import_opt('osapi_glance_link_prefix', 'nova.config')
 
 
 class ViewBuilder(common.ViewBuilder):
diff --git a/nova/api/openstack/compute/views/versions.py b/nova/api/openstack/compute/views/versions.py
index d3019ada6..a8c4286dd 100644
--- a/nova/api/openstack/compute/views/versions.py
+++ b/nova/api/openstack/compute/views/versions.py
@@ -19,11 +19,11 @@ import copy
 import os
 
 from nova.api.openstack import common
-from nova import config
 from nova.openstack.common import cfg
 
 
 CONF = cfg.CONF
+CONF.import_opt('osapi_compute_link_prefix', 'nova.config')
 
 
 def get_view_builder(req):