diff options
| author | Soren Hansen <soren@linux2go.dk> | 2011-07-26 14:08:29 -0700 |
|---|---|---|
| committer | Soren Hansen <soren@linux2go.dk> | 2011-07-26 14:08:29 -0700 |
| commit | 27f2f9d7efd72cc5275a82dfdb8f9f44ba7b71b3 (patch) | |
| tree | 81f1bc74d4ec1a6b955ab1185e5146aae45ee5a3 /doc/source | |
| parent | 3841a5515807b42e2e74e3119f76cdb2ef0f5575 (diff) | |
| parent | 4a52d4984e9349115f37d34e47e4d1141a8cf6fc (diff) | |
| download | nova-27f2f9d7efd72cc5275a82dfdb8f9f44ba7b71b3.tar.gz nova-27f2f9d7efd72cc5275a82dfdb8f9f44ba7b71b3.tar.xz nova-27f2f9d7efd72cc5275a82dfdb8f9f44ba7b71b3.zip | |
Merge trunk
Diffstat (limited to 'doc/source')
| -rw-r--r-- | doc/source/devref/index.rst | 7 | ||||
| -rw-r--r-- | doc/source/devref/multinic.rst | 4 |
2 files changed, 7 insertions, 4 deletions
diff --git a/doc/source/devref/index.rst b/doc/source/devref/index.rst index 0a5a7a4d6..859d4e331 100644 --- a/doc/source/devref/index.rst +++ b/doc/source/devref/index.rst @@ -30,13 +30,16 @@ Programming HowTos and Tutorials addmethod.openstackapi -Programming Concepts --------------------- +Background Concepts for Nova +---------------------------- .. toctree:: :maxdepth: 3 + distributed_scheduler + multinic zone rabbit + API Reference ------------- diff --git a/doc/source/devref/multinic.rst b/doc/source/devref/multinic.rst index b3a82d341..43830258f 100644 --- a/doc/source/devref/multinic.rst +++ b/doc/source/devref/multinic.rst @@ -29,11 +29,11 @@ FlatDHCP Manager .. image:: /images/multinic_dhcp.png -FlatDHCP manager builds on the the Flat manager adding dnsmask (DNS and DHCP) and radvd (Router Advertisement) servers on the bridge for that network. The services run on the host that is assigned to that nework. The FlatDHCP manager will create its bridge as specified when the network was created on the network-host when the network host starts up or when a new network gets allocated to that host. Compute nodes will also create the bridges as necessary and connect instance VIFs to them. +FlatDHCP manager builds on the the Flat manager adding dnsmask (DNS and DHCP) and radvd (Router Advertisement) servers on the bridge for that network. The services run on the host that is assigned to that network. The FlatDHCP manager will create its bridge as specified when the network was created on the network-host when the network host starts up or when a new network gets allocated to that host. Compute nodes will also create the bridges as necessary and connect instance VIFs to them. VLAN Manager ------------ .. image:: /images/multinic_vlan.png -The VLAN manager sets up forwarding to/from a cloudpipe instance in addition to providing dnsmask (DNS and DHCP) and radvd (Router Advertisement) services for each network. The manager will create its bridge as specified when the network was created on the network-host when the network host starts up or when a new network gets allocated to that host. Compute nodes will also create the bridges as necessary and conenct instance VIFs to them. +The VLAN manager sets up forwarding to/from a cloudpipe instance in addition to providing dnsmask (DNS and DHCP) and radvd (Router Advertisement) services for each network. The manager will create its bridge as specified when the network was created on the network-host when the network host starts up or when a new network gets allocated to that host. Compute nodes will also create the bridges as necessary and connect instance VIFs to them. |