Use CONF.import_opt() for nova.config opts

The only reason for importing nova.config now is where one of the
options defined in that file is needed. Rather than importing
nova.config using an import statement, use CONF.import_opt() so
that it is clear which option we actually require.

In future, we will move many options out of nova.config so many
of these import_opt() calls will either go away or cause a module
other than nova.config to be imported.

Change-Id: I0646efddecdf2530903afd50c1f4364cb1d5dce1
This commit is contained in:
Mark McLoughlin
2012-11-17 22:50:21 +00:00
parent 94d87bce21
commit e237c86446
109 changed files with 201 additions and 103 deletions

View File

@@ -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__)