summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTodd Willey <todd@ansolabs.com>2010-11-02 20:31:17 -0400
committerTodd Willey <todd@ansolabs.com>2010-11-02 20:31:17 -0400
commit583d1b1c4d039f1f9751c8a2cc0cf59bb77551e0 (patch)
tree4d344c454e36451686d25c8b4d05ba0ff7abcbe6
parent0cfeb666139b875cfe2952a67697a3d337967fbc (diff)
Fixes after trunk merge.
-rw-r--r--doc/source/nova.rst24
-rw-r--r--nova/tests/fake_flags.py1
2 files changed, 1 insertions, 24 deletions
diff --git a/doc/source/nova.rst b/doc/source/nova.rst
index 17d32c010..3963992ae 100644
--- a/doc/source/nova.rst
+++ b/doc/source/nova.rst
@@ -34,14 +34,6 @@ The :mod:`context` Module
:undoc-members:
:show-inheritance:
-The :mod:`crypto` Module
-------------------------
-
-.. automodule:: nova.crypto
- :members:
- :undoc-members:
- :show-inheritance:
-
The :mod:`exception` Module
---------------------------
@@ -58,14 +50,6 @@ The :mod:`flags` Module
:undoc-members:
:show-inheritance:
-The :mod:`manager` Module
--------------------------
-
-.. automodule:: nova.manager
- :members:
- :undoc-members:
- :show-inheritance:
-
The :mod:`process` Module
-------------------------
@@ -98,14 +82,6 @@ The :mod:`server` Module
:undoc-members:
:show-inheritance:
-The :mod:`service` Module
--------------------------
-
-.. automodule:: nova.service
- :members:
- :undoc-members:
- :show-inheritance:
-
The :mod:`test` Module
----------------------
diff --git a/nova/tests/fake_flags.py b/nova/tests/fake_flags.py
index 4bbef8832..bc377f0da 100644
--- a/nova/tests/fake_flags.py
+++ b/nova/tests/fake_flags.py
@@ -24,6 +24,7 @@ flags.DECLARE('volume_driver', 'nova.volume.manager')
FLAGS.volume_driver = 'nova.volume.driver.FakeAOEDriver'
FLAGS.connection_type = 'fake'
FLAGS.fake_rabbit = True
+flags.DECLARE('auth_driver', 'nova.auth.manager')
FLAGS.auth_driver = 'nova.auth.dbdriver.DbDriver'
flags.DECLARE('network_size', 'nova.network.manager')
flags.DECLARE('num_networks', 'nova.network.manager')