Clean up volumes / storage info.

doc/source/concepts.and.introduction.rst

@@ -61,10 +61,12 @@ Concept: Virtualization
 * qemu
 
 
-Concept: Volumes
+Concept: Storage
 ----------------
 
-Volumes
+* Ephemeral
+* Volumes
+* Swift
 
 
 Concept: Quotas

doc/source/database.rst

@@ -15,10 +15,32 @@
       License for the specific language governing permissions and limitations
       under the License.
 
-Nova Database Programming Guide
-===============================
+Database Programming Guide
+==========================
 
-::
+The :mod:`api` Module
+---------------------
+
+.. automodule:: nova.db.api
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+
+Drivers
+-------
+
+The :mod:sqlalchemy Driver
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. automodule:: nova.db.sqlalchemy.api
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+
+.. automodule:: nova.db.sqlalchemy.models
+    :members:
+    :undoc-members:
+    :show-inheritance:
 
-    * general interface
-    * sqlalchemy implementation

doc/source/development.guide.rst

@@ -28,7 +28,7 @@ Contents
    :maxdepth: 1
 
    database
-   storage
+   volume
    compute
    network      
    auth  

doc/source/storage.rst

@@ -1,47 +0,0 @@
-..
-      Copyright 2010 United States Government as represented by the
-      Administrator of the National Aeronautics and Space Administration. 
-      All Rights Reserved.
-
-      Licensed under the Apache License, Version 2.0 (the "License"); you may
-      not use this file except in compliance with the License. You may obtain
-      a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-      WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-      License for the specific language governing permissions and limitations
-      under the License.
-
-Storage in the Nova Cloud
-=========================
-
-
-from etherpad todo
--------------------
-::
-    * Volume Manager
-      * public methods
-      * responsibilities
-    * Volume Driver
-      * public methods
-      * AoE implementation
-      * ISCSI implementation
-
-
-legacy docs
------------
-
-There are three primary classes of storage in a nova cloud environment:
-
-* Ephemeral Storage (local disk within an instance)
-* Volume Storage (network-attached FS)
-* Object Storage (redundant KVS with locality and MR)
-
-.. toctree::
-   :maxdepth: 2
-   
-   volume
-   objectstore      

doc/source/volume.rst

@@ -15,9 +15,20 @@
       License for the specific language governing permissions and limitations
       under the License.
 
-Volume Documentation
-====================
-                           
+Volume Programming Guide
+=========================
+
+The :mod:`nova.volume.manager` Module
+-------------------------------------
+
+.. automodule:: nova.volume.manager
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+OLDHAT
+------
+
 Nova uses ata-over-ethernet (AoE) to export storage volumes from multiple storage nodes. These AoE exports are attached (using libvirt) directly to running instances.
 
 Nova volumes are exported over the primary system VLAN (usually VLAN 1), and not over individual VLANs.