summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/source/devref/architecture.rst2
-rw-r--r--doc/source/devref/fakes.rst10
-rw-r--r--doc/source/devref/volume.rst14
3 files changed, 1 insertions, 25 deletions
diff --git a/doc/source/devref/architecture.rst b/doc/source/devref/architecture.rst
index 7f44ecdf2..db5947a3e 100644
--- a/doc/source/devref/architecture.rst
+++ b/doc/source/devref/architecture.rst
@@ -33,7 +33,7 @@ Below you will find a helpful explanation of the different components.
[ Auth Manager ] ---
| \- ( DB )
|
- | [ scheduler ] - [ volume ] - ( ATAoE/iSCSI )
+ | [ scheduler ] - [ volume ] - ( iSCSI )
| /
[ Web Dashboard ] -> [ api ] -- < AMQP > ------ [ network ] - ( Flat/Vlan )
| \
diff --git a/doc/source/devref/fakes.rst b/doc/source/devref/fakes.rst
index b23c5a263..d98154871 100644
--- a/doc/source/devref/fakes.rst
+++ b/doc/source/devref/fakes.rst
@@ -44,16 +44,6 @@ The :mod:`nova.auth.fakeldap` Module
:show-inheritance:
-The :class:`nova.volume.driver.FakeAOEDriver` Class
----------------------------------------------------
-
-.. autoclass:: nova.volume.driver.FakeAOEDriver
- :noindex:
- :members:
- :undoc-members:
- :show-inheritance:
-
-
The :class:`nova.tests.service_unittest.FakeManager` Class
----------------------------------------------------------
diff --git a/doc/source/devref/volume.rst b/doc/source/devref/volume.rst
index c4dddb9ea..c9e0387ff 100644
--- a/doc/source/devref/volume.rst
+++ b/doc/source/devref/volume.rst
@@ -38,7 +38,6 @@ The :mod:`nova.volume.driver` Module
:members:
:undoc-members:
:show-inheritance:
- :exclude-members: FakeAOEDriver
Tests
-----
@@ -51,16 +50,3 @@ The :mod:`volume_unittest` Module
:members:
:undoc-members:
:show-inheritance:
-
-Old Docs
---------
-
-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.
-
-AoE exports are numbered according to a "shelf and blade" syntax. In order to avoid collisions, we currently perform an AoE-discover of existing exports, and then grab the next unused number. (This obviously has race condition problems, and should be replaced by allocating a shelf-id to each storage node.)
-
-The underlying volumes are LVM logical volumes, created on demand within a single large volume group.
-
-