diff options
Diffstat (limited to 'nova/api/openstack/compute')
25 files changed, 20 insertions, 27 deletions
diff --git a/nova/api/openstack/compute/__init__.py b/nova/api/openstack/compute/__init__.py index dc18a01a54..f886717338 100644 --- a/nova/api/openstack/compute/__init__.py +++ b/nova/api/openstack/compute/__init__.py @@ -31,7 +31,6 @@ 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 import config from nova.openstack.common import cfg from nova.openstack.common import log as logging @@ -42,7 +41,7 @@ allow_instance_snapshots_opt = cfg.BoolOpt('allow_instance_snapshots', default=True, help='Permit instance snapshot operations.') -CONF = config.CONF +CONF = cfg.CONF CONF.register_opt(allow_instance_snapshots_opt) diff --git a/nova/api/openstack/compute/contrib/__init__.py b/nova/api/openstack/compute/contrib/__init__.py index fc29433808..de912d6d8d 100644 --- a/nova/api/openstack/compute/contrib/__init__.py +++ b/nova/api/openstack/compute/contrib/__init__.py @@ -23,10 +23,11 @@ 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 = config.CONF +CONF = cfg.CONF LOG = logging.getLogger(__name__) diff --git a/nova/api/openstack/compute/contrib/admin_actions.py b/nova/api/openstack/compute/contrib/admin_actions.py index 3614d7ba1c..d651ed20ab 100644 --- a/nova/api/openstack/compute/contrib/admin_actions.py +++ b/nova/api/openstack/compute/contrib/admin_actions.py @@ -23,7 +23,6 @@ from nova.api.openstack import extensions from nova.api.openstack import wsgi from nova import compute from nova.compute import vm_states -from nova import config from nova import exception from nova.openstack.common import log as logging diff --git a/nova/api/openstack/compute/contrib/certificates.py b/nova/api/openstack/compute/contrib/certificates.py index c53fdabd58..11d819315b 100644 --- a/nova/api/openstack/compute/contrib/certificates.py +++ b/nova/api/openstack/compute/contrib/certificates.py @@ -20,7 +20,6 @@ from nova.api.openstack import extensions from nova.api.openstack import wsgi from nova.api.openstack import xmlutil import nova.cert.rpcapi -from nova import config from nova import network from nova.openstack.common import log as logging diff --git a/nova/api/openstack/compute/contrib/cloudpipe.py b/nova/api/openstack/compute/contrib/cloudpipe.py index 302ff7cf30..c41052ef12 100644 --- a/nova/api/openstack/compute/contrib/cloudpipe.py +++ b/nova/api/openstack/compute/contrib/cloudpipe.py @@ -25,12 +25,13 @@ from nova import config 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 from nova import utils -CONF = config.CONF +CONF = cfg.CONF LOG = logging.getLogger(__name__) authorize = extensions.extension_authorizer('compute', 'cloudpipe') diff --git a/nova/api/openstack/compute/contrib/config_drive.py b/nova/api/openstack/compute/contrib/config_drive.py index b972cf9b97..efdfe13cae 100644 --- a/nova/api/openstack/compute/contrib/config_drive.py +++ b/nova/api/openstack/compute/contrib/config_drive.py @@ -21,7 +21,6 @@ from nova.api.openstack.compute import servers from nova.api.openstack import extensions from nova.api.openstack import wsgi from nova.api.openstack import xmlutil -from nova import config authorize = extensions.soft_extension_authorizer('compute', 'config_drive') diff --git a/nova/api/openstack/compute/contrib/extended_server_attributes.py b/nova/api/openstack/compute/contrib/extended_server_attributes.py index 06847c727a..51fd7f3751 100644 --- a/nova/api/openstack/compute/contrib/extended_server_attributes.py +++ b/nova/api/openstack/compute/contrib/extended_server_attributes.py @@ -18,7 +18,6 @@ from nova.api.openstack import extensions from nova.api.openstack import wsgi from nova.api.openstack import xmlutil from nova import compute -from nova import config from nova import db from nova.openstack.common import log as logging diff --git a/nova/api/openstack/compute/contrib/extended_status.py b/nova/api/openstack/compute/contrib/extended_status.py index 55ff930f2f..759e361da3 100644 --- a/nova/api/openstack/compute/contrib/extended_status.py +++ b/nova/api/openstack/compute/contrib/extended_status.py @@ -18,7 +18,6 @@ from nova.api.openstack import extensions from nova.api.openstack import wsgi from nova.api.openstack import xmlutil from nova import compute -from nova import config from nova.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/nova/api/openstack/compute/contrib/fping.py b/nova/api/openstack/compute/contrib/fping.py index 8901195700..5afc6bc787 100644 --- a/nova/api/openstack/compute/contrib/fping.py +++ b/nova/api/openstack/compute/contrib/fping.py @@ -25,7 +25,6 @@ from webob import exc from nova.api.openstack import common from nova.api.openstack import extensions 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 @@ -42,7 +41,7 @@ fping_opts = [ help="Full path to fping."), ] -CONF = config.CONF +CONF = cfg.CONF CONF.register_opts(fping_opts) diff --git a/nova/api/openstack/compute/contrib/hosts.py b/nova/api/openstack/compute/contrib/hosts.py index 32582548c4..cc4144293c 100644 --- a/nova/api/openstack/compute/contrib/hosts.py +++ b/nova/api/openstack/compute/contrib/hosts.py @@ -23,7 +23,6 @@ from nova.api.openstack import extensions from nova.api.openstack import wsgi from nova.api.openstack import xmlutil from nova.compute import api as compute_api -from nova import config from nova import db from nova import exception from nova.openstack.common import log as logging 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 31a66b8feb..825d144332 100644 --- a/nova/api/openstack/compute/contrib/instance_usage_audit_log.py +++ b/nova/api/openstack/compute/contrib/instance_usage_audit_log.py @@ -23,9 +23,10 @@ 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 = config.CONF +CONF = cfg.CONF authorize = extensions.extension_authorizer('compute', diff --git a/nova/api/openstack/compute/contrib/networks.py b/nova/api/openstack/compute/contrib/networks.py index e7b7ac8a65..0a494ea88a 100644 --- a/nova/api/openstack/compute/contrib/networks.py +++ b/nova/api/openstack/compute/contrib/networks.py @@ -21,7 +21,6 @@ import webob from webob import exc from nova.api.openstack import extensions -from nova import config from nova import exception from nova import network from nova.openstack.common import log as logging diff --git a/nova/api/openstack/compute/contrib/rescue.py b/nova/api/openstack/compute/contrib/rescue.py index b76b54e8b4..02a961c228 100644 --- a/nova/api/openstack/compute/contrib/rescue.py +++ b/nova/api/openstack/compute/contrib/rescue.py @@ -23,11 +23,12 @@ 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 from nova import utils -CONF = config.CONF +CONF = cfg.CONF LOG = logging.getLogger(__name__) authorize = exts.extension_authorizer('compute', 'rescue') diff --git a/nova/api/openstack/compute/contrib/security_groups.py b/nova/api/openstack/compute/contrib/security_groups.py index ac5206a632..c382ce1d5f 100644 --- a/nova/api/openstack/compute/contrib/security_groups.py +++ b/nova/api/openstack/compute/contrib/security_groups.py @@ -27,7 +27,6 @@ from nova.api.openstack import wsgi from nova.api.openstack import xmlutil from nova import compute from nova.compute import api as compute_api -from nova import config from nova import db from nova import exception from nova.openstack.common import log as logging diff --git a/nova/api/openstack/compute/contrib/services.py b/nova/api/openstack/compute/contrib/services.py index 6c3a6688d5..793395b0b7 100644 --- a/nova/api/openstack/compute/contrib/services.py +++ b/nova/api/openstack/compute/contrib/services.py @@ -24,6 +24,7 @@ from nova.api.openstack import xmlutil from nova import config 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 @@ -31,7 +32,7 @@ from nova import utils LOG = logging.getLogger(__name__) authorize = extensions.extension_authorizer('compute', 'services') -CONF = config.CONF +CONF = cfg.CONF class ServicesIndexTemplate(xmlutil.TemplateBuilder): diff --git a/nova/api/openstack/compute/contrib/simple_tenant_usage.py b/nova/api/openstack/compute/contrib/simple_tenant_usage.py index c51faef1bf..9fc2e97fb1 100644 --- a/nova/api/openstack/compute/contrib/simple_tenant_usage.py +++ b/nova/api/openstack/compute/contrib/simple_tenant_usage.py @@ -22,7 +22,6 @@ from nova.api.openstack import extensions from nova.api.openstack import wsgi from nova.api.openstack import xmlutil from nova.compute import api -from nova import config from nova import exception from nova.openstack.common import timeutils diff --git a/nova/api/openstack/compute/contrib/volumes.py b/nova/api/openstack/compute/contrib/volumes.py index c58a70d3cb..abdef3a7d3 100644 --- a/nova/api/openstack/compute/contrib/volumes.py +++ b/nova/api/openstack/compute/contrib/volumes.py @@ -24,7 +24,6 @@ from nova.api.openstack import extensions from nova.api.openstack import wsgi from nova.api.openstack import xmlutil from nova import compute -from nova import config from nova import exception from nova.openstack.common import log as logging from nova import utils diff --git a/nova/api/openstack/compute/extensions.py b/nova/api/openstack/compute/extensions.py index 4805ba4e6c..c92f8b19f4 100644 --- a/nova/api/openstack/compute/extensions.py +++ b/nova/api/openstack/compute/extensions.py @@ -17,12 +17,13 @@ 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 LOG = logging.getLogger(__name__) -CONF = config.CONF +CONF = cfg.CONF class ExtensionManager(base_extensions.ExtensionManager): diff --git a/nova/api/openstack/compute/image_metadata.py b/nova/api/openstack/compute/image_metadata.py index 375bbc4d59..0c673f35e1 100644 --- a/nova/api/openstack/compute/image_metadata.py +++ b/nova/api/openstack/compute/image_metadata.py @@ -19,7 +19,6 @@ from webob import exc from nova.api.openstack import common from nova.api.openstack import wsgi -from nova import config from nova import exception from nova.image import glance diff --git a/nova/api/openstack/compute/images.py b/nova/api/openstack/compute/images.py index bdd0e09162..7dda64f87f 100644 --- a/nova/api/openstack/compute/images.py +++ b/nova/api/openstack/compute/images.py @@ -19,7 +19,6 @@ from nova.api.openstack import common from nova.api.openstack.compute.views import images as views_images from nova.api.openstack import wsgi from nova.api.openstack import xmlutil -from nova import config from nova import exception import nova.image.glance from nova.openstack.common import log as logging diff --git a/nova/api/openstack/compute/ips.py b/nova/api/openstack/compute/ips.py index a01066d0e1..7b196d956c 100644 --- a/nova/api/openstack/compute/ips.py +++ b/nova/api/openstack/compute/ips.py @@ -22,7 +22,6 @@ from nova.api.openstack import common from nova.api.openstack.compute.views import addresses as view_addresses from nova.api.openstack import wsgi from nova.api.openstack import xmlutil -from nova import config from nova.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/nova/api/openstack/compute/servers.py b/nova/api/openstack/compute/servers.py index 2c22ccc48f..e105969ddf 100644 --- a/nova/api/openstack/compute/servers.py +++ b/nova/api/openstack/compute/servers.py @@ -32,6 +32,7 @@ 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 from nova.openstack.common import log as logging from nova.openstack.common.rpc import common as rpc_common @@ -41,7 +42,7 @@ from nova import utils LOG = logging.getLogger(__name__) -CONF = config.CONF +CONF = cfg.CONF def make_fault(elem): diff --git a/nova/api/openstack/compute/views/addresses.py b/nova/api/openstack/compute/views/addresses.py index c5ccb02fdc..e1d75a9aa7 100644 --- a/nova/api/openstack/compute/views/addresses.py +++ b/nova/api/openstack/compute/views/addresses.py @@ -18,7 +18,6 @@ import itertools from nova.api.openstack import common -from nova import config from nova.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/nova/api/openstack/compute/views/images.py b/nova/api/openstack/compute/views/images.py index 228af7c8d7..cf67334318 100644 --- a/nova/api/openstack/compute/views/images.py +++ b/nova/api/openstack/compute/views/images.py @@ -19,9 +19,10 @@ import os.path from nova.api.openstack import common from nova import config +from nova.openstack.common import cfg from nova import utils -CONF = config.CONF +CONF = cfg.CONF class ViewBuilder(common.ViewBuilder): diff --git a/nova/api/openstack/compute/views/versions.py b/nova/api/openstack/compute/views/versions.py index 594369490a..d3019ada62 100644 --- a/nova/api/openstack/compute/views/versions.py +++ b/nova/api/openstack/compute/views/versions.py @@ -20,9 +20,10 @@ import os from nova.api.openstack import common from nova import config +from nova.openstack.common import cfg -CONF = config.CONF +CONF = cfg.CONF def get_view_builder(req): |