diff options
| author | Vishvananda Ishaya <vishvananda@gmail.com> | 2010-10-27 16:37:40 -0700 |
|---|---|---|
| committer | Vishvananda Ishaya <vishvananda@gmail.com> | 2010-10-27 16:37:40 -0700 |
| commit | 21d4fce6dd8cf34ca729ef39abbabc02e466429e (patch) | |
| tree | c56ebc533ddc4402af9791855d79d14289937ec9 /doc/source | |
| parent | 0211ec7d61bea7e818418b6f17fdd45770ca9337 (diff) | |
| parent | a1287cf4e15d469163ec6465ea5f6ce200c20543 (diff) | |
| download | nova-21d4fce6dd8cf34ca729ef39abbabc02e466429e.tar.gz nova-21d4fce6dd8cf34ca729ef39abbabc02e466429e.tar.xz nova-21d4fce6dd8cf34ca729ef39abbabc02e466429e.zip | |
merged and fixed conflicts
Diffstat (limited to 'doc/source')
| -rw-r--r-- | doc/source/auth.rst | 24 | ||||
| -rw-r--r-- | doc/source/compute.rst | 54 | ||||
| -rw-r--r-- | doc/source/conf.py | 2 |
3 files changed, 45 insertions, 35 deletions
diff --git a/doc/source/auth.rst b/doc/source/auth.rst index 0e3303949..4d3037253 100644 --- a/doc/source/auth.rst +++ b/doc/source/auth.rst @@ -127,7 +127,7 @@ CloudAudit queries may spawn long-running processes (similar to launching instan RBAC of CloudAudit API calls is critical, since detailed system information is a system vulnerability. Type declarations ---------------------- +----------------- * Data declarations – Volumes and Objects * System declarations – Instances @@ -198,14 +198,30 @@ The :mod:`signer` Module :undoc-members: :show-inheritance: -The :mod:`auth` Module ------------------------ +The :mod:`manager` Module +------------------------- .. automodule:: nova.auth.manager :members: :undoc-members: :show-inheritance: +The :mod:`ldapdriver` Module +---------------------------- + +.. automodule:: nova.auth.ldapdriver + :members: + :undoc-members: + :show-inheritance: + +The :mod:`dbdriver` Module +---------------------------- + +.. automodule:: nova.auth.dbdriver + :members: + :undoc-members: + :show-inheritance: + The :mod:`auth_unittest` Module -------------------------------- @@ -223,7 +239,7 @@ The :mod:`access_unittest` Module :show-inheritance: The :mod:`ec2` Module ------------------------- +--------------------- .. automodule:: nova.api.ec2 :members: diff --git a/doc/source/compute.rst b/doc/source/compute.rst index 76957f316..93070fa88 100644 --- a/doc/source/compute.rst +++ b/doc/source/compute.rst @@ -15,80 +15,74 @@ License for the specific language governing permissions and limitations under the License. -Compute Documentation -===================== - from etherpad todo ------------------ -:: * FIX RST IMPORT ERRORS * Compute Manager * public methods * responsibilities * Compute Driver * public methods - * libvirt implementation - - kvm/qemu - - uml + * libvirt implementation (kvm/qemu vs uml) * xen implementation * hyperv implementation -legacy docs ------------ +Compute Documentation +===================== This page contains the Compute Package documentation. -The :mod:`disk` Module ----------------------- +The :mod:`manager` Module +------------------------- -.. automodule:: nova.compute.disk +.. automodule:: nova.compute.manager :members: :undoc-members: :show-inheritance: -The :mod:`exception` Module ---------------------------- +The :mod:`disk` Module +---------------------- -.. automodule:: nova.compute.exception +.. automodule:: nova.compute.disk :members: :undoc-members: :show-inheritance: -The :mod:`model` Module -------------------------- +The :mod:`instance_types` Module +-------------------------------- -.. automodule:: nova.compute.model +.. automodule:: nova.compute.instance_types :members: :undoc-members: :show-inheritance: - -The :mod:`network` Module -------------------------- -.. automodule:: nova.compute.network +The :mod:`power_state` Module +----------------------------- + +.. automodule:: nova.compute.power_state :members: :undoc-members: :show-inheritance: -The :mod:`node` Module ----------------------- +The :mod:`monitor` Module +------------------------- -.. automodule:: nova.compute.node +.. automodule:: nova.compute.monitor :members: :undoc-members: :show-inheritance: - + RELATED TESTS ---------------- +------------- -The :mod:`node_unittest` Module -------------------------------- +The :mod:`compute_unittest` Module +---------------------------------- -.. automodule:: nova.tests.node_unittest +.. automodule:: nova.tests.compute_unittest :members: :undoc-members: :show-inheritance: diff --git a/doc/source/conf.py b/doc/source/conf.py index 34f049362..e91860536 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -16,7 +16,7 @@ import sys, os # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the # documentation root, use os.path.abspath to make it absolute, like shown here. -sys.path.append([os.path.abspath('../../'), os.path.abspath('../../bin')]) +sys.path.insert(0, os.path.abspath('../../')) # -- General configuration ----------------------------------------------------- |