openstack
/
nova
Code Issues Proposed changes

Fix formatting errors in documentation 

Fix a few rst formatting errors in the docs so
sphinx does not generate warnings.

Change-Id: I000d2ca3961678b47ead7a7885f3bc88ed7babc7
Signed-off-by: Doug Hellmann <doug.hellmann@dreamhost.com>
This commit is contained in:
Doug Hellmann 2013-06-28 20:18:08 -04:00
parent 47500553d9
commit 42a02a1d73
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/source/devref/aggregates.rst
View File

@ -17,18 +17,18 @@
under the License.
General Host Aggregates
===============
=======================
Host aggregates can be regarded as a mechanism to further partition an availability zone; while availability zones are visible to users, host aggregates are only visible to administrators. Host aggregates started out as a way to use Xen hypervisor resource pools, but has been generalized to provide a mechanism to allow administrators to assign key-value pairs to groups of machines. Each node can have multiple aggregates, each aggregate can have multiple key-value pairs, and the same key-value pair can be assigned to multiple aggregate. This information can be used in the scheduler to enable advanced scheduling, to set up xen hypervisor resources pools or to define logical groups for migration.
Xen Pool Host Aggregates
===============
========================
Originally all aggregates were Xen resource pools, now an aggregate can be set up as a resource pool by giving the aggregate the correct key-value pair.
You can use aggregates for XenServer resource pools when you have multiple compute nodes installed (only XenServer/XCP via xenapi driver is currently supported), and you want to leverage the capabilities of the underlying hypervisor resource pools. For example, you want to enable VM live migration (i.e. VM migration within the pool) or enable host maintenance with zero-downtime for guest instances. Please, note that VM migration across pools (i.e. storage migration) is not yet supported in XenServer/XCP, but will be added when available. Bear in mind that the two migration techniques are not mutually exclusive and can be used in combination for a higher level of flexibility in your cloud management.
Design
=======
======
The OSAPI Admin API is extended to support the following operations:

10
doc/source/man/nova-conductor.rst
View File

@ -1,10 +1,10 @@
==========
==============
nova-conductor
==========
==============
--------------------------------
-----------------------------
Server for the Nova Conductor
--------------------------------
-----------------------------
:Author: openstack@lists.launchpad.net
:Date: 2012-11-16
@ -29,7 +29,7 @@ OPTIONS
**General options**
FILES
========
=====
* /etc/nova/nova.conf