Rename 'nova.common.config' module to 'nova.middleware'
There was only one sub-module in 'nova.common' but its presence interferes with tab complete for the majority of people that want 'nova/compute'. Just move that sub-module to its own top-level module and be done. Change-Id: Iee886d915577f347e1ee4f54133ae0f87ae75841 Signed-off-by: Stephen Finucane <sfinucan@redhat.com>
This commit is contained in:
parent
872a823d9a
commit
a1d3519dcc
@ -18,9 +18,9 @@
|
|||||||
from oslo_log import log
|
from oslo_log import log
|
||||||
from oslo_utils import importutils
|
from oslo_utils import importutils
|
||||||
|
|
||||||
from nova.common import config
|
|
||||||
import nova.conf
|
import nova.conf
|
||||||
from nova.db.sqlalchemy import api as sqlalchemy_api
|
from nova.db.sqlalchemy import api as sqlalchemy_api
|
||||||
|
from nova import middleware
|
||||||
from nova import rpc
|
from nova import rpc
|
||||||
from nova import version
|
from nova import version
|
||||||
|
|
||||||
@ -49,7 +49,7 @@ def parse_args(argv, default_config_files=None, configure_db=True,
|
|||||||
rpc.set_defaults(control_exchange='nova')
|
rpc.set_defaults(control_exchange='nova')
|
||||||
if profiler:
|
if profiler:
|
||||||
profiler.set_defaults(CONF)
|
profiler.set_defaults(CONF)
|
||||||
config.set_middleware_defaults()
|
middleware.set_defaults()
|
||||||
|
|
||||||
CONF(argv[1:],
|
CONF(argv[1:],
|
||||||
project='nova',
|
project='nova',
|
||||||
|
@ -15,7 +15,7 @@
|
|||||||
from oslo_middleware import cors
|
from oslo_middleware import cors
|
||||||
|
|
||||||
|
|
||||||
def set_middleware_defaults():
|
def set_defaults():
|
||||||
"""Update default configuration options for oslo.middleware."""
|
"""Update default configuration options for oslo.middleware."""
|
||||||
cors.set_defaults(
|
cors.set_defaults(
|
||||||
allow_headers=['X-Auth-Token',
|
allow_headers=['X-Auth-Token',
|
@ -37,7 +37,7 @@ oslo.config.opts =
|
|||||||
nova.conf = nova.conf.opts:list_opts
|
nova.conf = nova.conf.opts:list_opts
|
||||||
|
|
||||||
oslo.config.opts.defaults =
|
oslo.config.opts.defaults =
|
||||||
nova.conf = nova.common.config:set_middleware_defaults
|
nova.conf = nova.middleware:set_defaults
|
||||||
|
|
||||||
oslo.policy.enforcer =
|
oslo.policy.enforcer =
|
||||||
nova = nova.policy:get_enforcer
|
nova = nova.policy:get_enforcer
|
||||||
|
Loading…
Reference in New Issue
Block a user