diff --git a/nova/config.py b/nova/config.py index 86eb5bf62ec8..67fc1f23743f 100644 --- a/nova/config.py +++ b/nova/config.py @@ -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__), '../')), diff --git a/nova/tests/conf_fixture.py b/nova/tests/conf_fixture.py index c0466447d165..6a8b3397d753 100644 --- a/nova/tests/conf_fixture.py +++ b/nova/tests/conf_fixture.py @@ -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): diff --git a/nova/wsgi.py b/nova/wsgi.py index 19dcd2d60eae..e7e7315239f9 100644 --- a/nova/wsgi.py +++ b/nova/wsgi.py @@ -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__)