diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-12-13 15:21:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-12-13 15:21:30 +0000 |
| commit | e1dea7cd63d2a9310b03f445ed8126418abafa79 (patch) | |
| tree | f43d918e0bc7d38a01105299170db9697e21f227 | |
| parent | 78e54998b608cd79471ec5aa6207d43e0331ad82 (diff) | |
| parent | 6808becda11a7682c6c56cd3b2afd55601cf1590 (diff) | |
| download | nova-e1dea7cd63d2a9310b03f445ed8126418abafa79.tar.gz nova-e1dea7cd63d2a9310b03f445ed8126418abafa79.tar.xz nova-e1dea7cd63d2a9310b03f445ed8126418abafa79.zip | |
Merge "Move API extension opts to api.openstack.compute"
| -rw-r--r-- | nova/api/openstack/compute/contrib/__init__.py | 11 | ||||
| -rw-r--r-- | nova/api/openstack/compute/extensions.py | 11 | ||||
| -rw-r--r-- | nova/config.py | 10 |
3 files changed, 18 insertions, 14 deletions
diff --git a/nova/api/openstack/compute/contrib/__init__.py b/nova/api/openstack/compute/contrib/__init__.py index ec09ae941..7b21a0be8 100644 --- a/nova/api/openstack/compute/contrib/__init__.py +++ b/nova/api/openstack/compute/contrib/__init__.py @@ -25,9 +25,16 @@ from nova.api.openstack import extensions from nova.openstack.common import cfg from nova.openstack.common import log as logging - +ext_opts = [ + cfg.ListOpt('osapi_compute_ext_list', + default=[], + help='Specify list of extensions to load when using osapi_' + 'compute_extension option with nova.api.openstack.' + 'compute.contrib.select_extensions'), +] CONF = cfg.CONF -CONF.import_opt('osapi_compute_ext_list', 'nova.config') +CONF.register_opts(ext_opts) + LOG = logging.getLogger(__name__) diff --git a/nova/api/openstack/compute/extensions.py b/nova/api/openstack/compute/extensions.py index d3c31daca..1d0738417 100644 --- a/nova/api/openstack/compute/extensions.py +++ b/nova/api/openstack/compute/extensions.py @@ -20,10 +20,17 @@ from nova.openstack.common import cfg from nova.openstack.common import log as logging from nova.openstack.common.plugin import pluginmanager +ext_opts = [ + cfg.MultiStrOpt('osapi_compute_extension', + default=[ + 'nova.api.openstack.compute.contrib.standard_extensions' + ], + help='osapi compute extension to load'), +] +CONF = cfg.CONF +CONF.register_opts(ext_opts) LOG = logging.getLogger(__name__) -CONF = cfg.CONF -CONF.import_opt('osapi_compute_extension', 'nova.config') class ExtensionManager(base_extensions.ExtensionManager): diff --git a/nova/config.py b/nova/config.py index 418877d12..f0da96889 100644 --- a/nova/config.py +++ b/nova/config.py @@ -109,16 +109,6 @@ global_opts = [ cfg.ListOpt('enabled_apis', default=['ec2', 'osapi_compute', 'metadata'], help='a list of APIs to enable by default'), - cfg.ListOpt('osapi_compute_ext_list', - default=[], - help='Specify list of extensions to load when using osapi_' - 'compute_extension option with nova.api.openstack.' - 'compute.contrib.select_extensions'), - cfg.MultiStrOpt('osapi_compute_extension', - default=[ - 'nova.api.openstack.compute.contrib.standard_extensions' - ], - help='osapi compute extension to load'), cfg.StrOpt('osapi_compute_unique_server_name_scope', default='', help='When set, compute API will consider duplicate hostnames ' |