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 /nova/tests/conf_fixture.py | |
| 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"
Diffstat (limited to 'nova/tests/conf_fixture.py')
| -rw-r--r-- | nova/tests/conf_fixture.py | 1 |
1 files changed, 1 insertions, 0 deletions
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): |