summaryrefslogtreecommitdiffstats
path: root/doc/source
diff options
context:
space:
mode:
authorAnne Gentle <anne@openstack.org>2011-01-03 10:59:13 -0600
committerAnne Gentle <anne@openstack.org>2011-01-03 10:59:13 -0600
commit26da70249e24b144607af310e0feaa84fb26d771 (patch)
tree0267cdde45568b9772226c133157297a018cc1c5 /doc/source
parenta14807c9de0b555427aad10a172a929a07fd9505 (diff)
Minor edits prior to merging changes to the script file
Diffstat (limited to 'doc/source')
-rw-r--r--doc/source/adminguide/network.vlan.rst3
-rw-r--r--doc/source/cloud101.rst3
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/source/adminguide/network.vlan.rst b/doc/source/adminguide/network.vlan.rst
index c6c4e7f91..d4d9d92fa 100644
--- a/doc/source/adminguide/network.vlan.rst
+++ b/doc/source/adminguide/network.vlan.rst
@@ -91,11 +91,10 @@ These do NOT have IP addresses in the host to protect host access.
Compute nodes have iptables/ebtables entries created per project and
instance to protect against IP/MAC address spoofing and ARP poisoning.
-The network assignment to a project, and IP address assignment to a VM instance, are triggered when a user starts to run a VM instance. When running a VM instance, a user needs to specify a project for the instances, and the security groups (described in Security Groups) when the instance wants to join. If this is the first instance to be created for the project, then Nova (the cloud controller) needs to find a network controller to be the network host for the project; it then sets up a private network by finding an unused VLAN id, an unused subnet, and then the controller assigns them to the project, it also assigns a name to the project's Linux bridge, and allocating a private IP within the project's subnet for the new instance.
+The network assignment to a project, and IP address assignment to a VM instance, are triggered when a user starts to run a VM instance. When running a VM instance, a user needs to specify a project for the instances, and the security groups (described in Security Groups) when the instance wants to join. If this is the first instance to be created for the project, then Nova (the cloud controller) needs to find a network controller to be the network host for the project; it then sets up a private network by finding an unused VLAN id, an unused subnet, and then the controller assigns them to the project, it also assigns a name to the project's Linux bridge (br100 stored in the Nova database), and allocating a private IP within the project's subnet for the new instance.
If the instance the user wants to start is not the project's first, a subnet and a VLAN must have already been assigned to the project; therefore the system needs only to find an available IP address within the subnet and assign it to the new starting instance. If there is no private IP available within the subnet, an exception will be raised to the cloud controller, and the VM creation cannot proceed.
-.. todo:: insert the name of the Linux bridge, is it always named bridge?
External Infrastructure
-----------------------
diff --git a/doc/source/cloud101.rst b/doc/source/cloud101.rst
index 7c79d2a70..5c0fcd60d 100644
--- a/doc/source/cloud101.rst
+++ b/doc/source/cloud101.rst
@@ -87,4 +87,5 @@ A hybrid cloud can be a deployment model, as a composition of both public and pr
Work in the Clouds
------------------
-.. todo:: What people have done/sample projects
+What have people done with cloud computing? Cloud computing can help with large-scale computing needs or can lead consolidation efforts by virtualizing servers to make more use of existing hardware (and possibly release old hardware from service.) People also use cloud computing for collaboration because of the high availability through networked computers. Productivity suites for word processing, number crunching, and email communications, and more are also available through cloud computing. Cloud computing also avails additional storage to the cloud user, avoiding the need for additional hard drives on your desktop and enabling access to large, huge data storage capacity online in the cloud.
+