diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-12-12 02:38:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-12-12 02:38:51 +0000 |
| commit | b37e50644f9ef6e243358dc464be2b8a3fb2be7d (patch) | |
| tree | 7af841193006f69d6a78fc727fe5808f5121f0e5 | |
| parent | c568435e987fae708d4c7a96780790eecfd28887 (diff) | |
| parent | 855869af9b6fbde4896cc66c2df87bdaaa5e256f (diff) | |
| download | nova-b37e50644f9ef6e243358dc464be2b8a3fb2be7d.tar.gz nova-b37e50644f9ef6e243358dc464be2b8a3fb2be7d.tar.xz nova-b37e50644f9ef6e243358dc464be2b8a3fb2be7d.zip | |
Merge "Move api_paste_config option into nova.wsgi"
| -rw-r--r-- | nova/config.py | 3 | ||||
| -rw-r--r-- | nova/tests/conf_fixture.py | 1 | ||||
| -rw-r--r-- | nova/wsgi.py | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/nova/config.py b/nova/config.py index 86eb5bf62..67fc1f237 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 5f5865cf3..fa7ecebf4 100644 --- a/nova/tests/conf_fixture.py +++ b/nova/tests/conf_fixture.py @@ -30,6 +30,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 19dcd2d60..e7e731523 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__) |