summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnne Gentle <anne@openstack.org>2010-11-12 13:42:07 -0600
committerAnne Gentle <anne@openstack.org>2010-11-12 13:42:07 -0600
commitfa57e5ad73b7f36c177857ca3b69267e421a8275 (patch)
treec29c2edf60d1700f4d1f21c32e8fb6f6654725b7
parent09c29649ec2b2df68b9c1c57aeff5573d3c83e4a (diff)
downloadnova-fa57e5ad73b7f36c177857ca3b69267e421a8275.tar.gz
nova-fa57e5ad73b7f36c177857ca3b69267e421a8275.tar.xz
nova-fa57e5ad73b7f36c177857ca3b69267e421a8275.zip
Just a few more edits, misspellings and the like
-rw-r--r--doc/source/nova.concepts.rst7
-rw-r--r--doc/source/quickstart.rst12
-rw-r--r--doc/source/service.architecture.rst4
3 files changed, 17 insertions, 6 deletions
diff --git a/doc/source/nova.concepts.rst b/doc/source/nova.concepts.rst
index ce251dd14..ddf0f1b82 100644
--- a/doc/source/nova.concepts.rst
+++ b/doc/source/nova.concepts.rst
@@ -31,7 +31,7 @@ run on your host operating system, and exposes functionality over a web API.
This document does not attempt to explain fundamental concepts of cloud
computing, IaaS, virtualization, or other related technologies. Instead, it
-focues on describing how Nova's implementation of those concepts is achieved.
+focuses on describing how Nova's implementation of those concepts is achieved.
This page outlines concepts that you will need to understand as a user or
administrator of an OpenStack installation. Each section links to more more
@@ -121,7 +121,7 @@ This is similar to the flat mode, in that all instances are attached to the same
VLAN DHCP Mode
~~~~~~~~~~~~~~
-This is the default networking mode and supports the most features. For multiple machine installation, it requires a switch that supports host-managed vlan tagging. In this mode, nova will create a vlan and bridge for each project. The project gets a range of private ips that are only accessible from inside the vlan. In order for a user to access the instances in their project, a special vpn instance (code named :ref:`cloudpipe <cloudpipe>`) needs to be created. Nova generates a certificate and key for the userto access the vpn and starts the vpn automatically. More information on cloudpipe can be found :ref:`here <cloudpipe>`.
+This is the default networking mode and supports the most features. For multiple machine installation, it requires a switch that supports host-managed vlan tagging. In this mode, nova will create a vlan and bridge for each project. The project gets a range of private ips that are only accessible from inside the vlan. In order for a user to access the instances in their project, a special vpn instance (code named :ref:`cloudpipe <cloudpipe>`) needs to be created. Nova generates a certificate and key for the user to access the vpn and starts the vpn automatically. More information on cloudpipe can be found :ref:`here <cloudpipe>`.
The following diagram illustrates how the communication that occurs between the vlan (the dashed box) and the public internet (represented by the two clouds)
@@ -168,8 +168,7 @@ Concept: Plugins
Concept: IPC/RPC
----------------
-Rabbit!
-
+Nova utilizes the RabbitMQ implementation of the AMQP messaging standard for performing communication between the various nova services. This message queuing service is used for both local and remote communication because Nova is designed so that there is no requirement that any of the services exist on the same physical machine. RabbitMQ in particular is very robust and provides the efficiency and reliability that Nova needs. More information about RabbitMQ can be found at http://www.rabbitmq.com/.
Concept: Fakes
--------------
diff --git a/doc/source/quickstart.rst b/doc/source/quickstart.rst
index 22e026ce7..ae2b64d8a 100644
--- a/doc/source/quickstart.rst
+++ b/doc/source/quickstart.rst
@@ -164,3 +164,15 @@ Then you can destroy the screen:
If things get particularly messed up, you might need to do some more intense
cleanup. Be careful, the following command will manually destroy all runnning
virsh instances and attempt to delete all vlans and bridges.
+
+::
+
+ ./nova.sh scrub
+
+You can edit files in the install directory or do a bzr pull to pick up new versions. You only need to do
+
+::
+
+ ./nova.sh run
+
+to run nova after the first install. The database should be cleaned up on each run. \ No newline at end of file
diff --git a/doc/source/service.architecture.rst b/doc/source/service.architecture.rst
index df8edf864..28a32bec6 100644
--- a/doc/source/service.architecture.rst
+++ b/doc/source/service.architecture.rst
@@ -17,7 +17,7 @@ Nova’s Cloud Fabric is composed of the following major components:
API Server
--------------------------------------------------
-At the heart of the cloud framework is an API Server. This API Server makes command and control [#f80]_ of the hypervisor, storage, and networking programmatically available to users in realization of the definition of cloud computing.
+At the heart of the cloud framework is an API Server. This API Server makes command and control of the hypervisor, storage, and networking programmatically available to users in realization of the definition of cloud computing.
The API endpoints are basic http web services which handle authentication, authorization, and basic command and control functions using various API interfaces under the Amazon, Rackspace, and related models. This enables API compatibility with multiple existing tool sets created for interaction with offerings from other vendors. This broad compatibility prevents vendor lock-in.
@@ -48,7 +48,7 @@ The Network Controller manages the networking resources on host machines. The A
Volume Workers
--------------------------------------------------
-Volume Workers interact with iSCSI storage to manage LVM-based [#f89]_ instance volumes. Specific functions include:
+Volume Workers interact with iSCSI storage to manage LVM-based instance volumes. Specific functions include:
* Create Volumes
* Delete Volumes