Merge "Fixed nova flavor default list"

This commit is contained in:
Jenkins
2014-06-08 08:45:51 +00:00
committed by Gerrit Code Review

View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<section xmlns="http://docbook.org/ns/docbook"
xmlns:xi="http://www.w3.org/2001/XInclude"
xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
@@ -72,26 +72,93 @@
</varlistentry>
</variablelist>
<para>The default flavors are:</para>
<itemizedlist>
<listitem>
<para>m1.tiny (1 VCPU/0 GB Disk/512 MB RAM)</para>
</listitem>
<listitem>
<para>m1.smaller (1 VCPU/0 GB Disk/1024 MB RAM)</para>
</listitem>
<listitem>
<para>m1.small (1 VCPU/10 GB Disk/2048 MB RAM)</para>
</listitem>
<listitem>
<para>m1.medium (2 VCPU/10 GB Disk/3072 MB RAM)</para>
</listitem>
<listitem>
<para>m1.large (4 VCPU/10 GB Disk/8192 MB RAM)</para>
</listitem>
<listitem>
<para>m1.xlarge (8 VCPU/10 GB Disk/8192 MB RAM)</para>
</listitem>
</itemizedlist>
<informaltable rules="all" width="50%">
<col width="30%"/>
<col width="20%"/>
<col width="25%"/>
<col width="25%"/>
<thead>
<tr>
<th>Flavor</th>
<th>VCPUs</th>
<th>Disk (in GB)</th>
<th>RAM (in MB)</th>
</tr>
</thead>
<tbody>
<tr>
<td>
<para>m1.tiny</para>
</td>
<td>
<para>1</para>
</td>
<td>
<para>1</para>
</td>
<td>
<para>512</para>
</td>
</tr>
<tr>
<td>
<para>m1.small</para>
</td>
<td>
<para>1</para>
</td>
<td>
<para>20</para>
</td>
<td>
<para>2048</para>
</td>
</tr>
<tr>
<td>
<para>m1.medium</para>
</td>
<td>
<para>2</para>
</td>
<td>
<para>40</para>
</td>
<td>
<para>4096</para>
</td>
</tr>
<tr>
<td>
<para>m1.large</para>
</td>
<td>
<para>4</para>
</td>
<td>
<para>80</para>
</td>
<td>
<para>8192</para>
</td>
</tr>
<tr>
<td>
<para>m1.xlarge</para>
</td>
<td>
<para>8</para>
</td>
<td>
<para>160</para>
</td>
<td>
<para>16384</para>
</td>
</tr>
</tbody>
</informaltable>
<para>You can create and manage flavors with the nova
<command>flavor-*</command> commands provided by the
<filename>python-novaclient</filename> package.</para>