openstack/nova
Code Issues Proposed changes

Move api_paste_config option into nova.wsgi

Browse Source 
The api_paste_config option is only used in nova.wsgi so we can
have it be registered there too.

blueprint: scope-config-opts
Change-Id: I438102b2524bd96faf8392f3ba600235ce7116a4
This commit is contained in:
Mark McLoughlin 2012-12-11 07:26:17 +00:00
parent fcedc02a6f
commit 855869af9b
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nova/config.py
View File

@ -43,9 +43,6 @@ def _get_my_ip():
core_opts = [
cfg.StrOpt('api_paste_config',
default="api-paste.ini",
help='File name for the paste.deploy config for nova-api'),
cfg.StrOpt('pybasedir',
default=os.path.abspath(os.path.join(os.path.dirname(__file__),
'../')),

1
nova/tests/conf_fixture.py
View File

@ -29,6 +29,7 @@ CONF.import_opt('network_size', 'nova.network.manager')
CONF.import_opt('num_networks', 'nova.network.manager')
CONF.import_opt('policy_file', 'nova.policy')
CONF.import_opt('compute_driver', 'nova.virt.driver')
CONF.import_opt('api_paste_config', 'nova.wsgi')
class ConfFixture(fixtures.Fixture):

4
nova/wsgi.py
View File

@ -35,6 +35,9 @@ from nova.openstack.common import cfg
from nova.openstack.common import log as logging
wsgi_opts = [
cfg.StrOpt('api_paste_config',
default="api-paste.ini",
help='File name for the paste.deploy config for nova-api'),
cfg.StrOpt('wsgi_log_format',
default='%(client_ip)s "%(request_line)s" status: %(status_code)s'
' len: %(body_length)s time: %(wall_seconds).7f',
@ -45,7 +48,6 @@ wsgi_opts = [
]
CONF = cfg.CONF
CONF.register_opts(wsgi_opts)
CONF.import_opt('api_paste_config', 'nova.config')
LOG = logging.getLogger(__name__)