From 16c814b3cae53f638ddde88870f3c9e418dc4cd7 Mon Sep 17 00:00:00 2001
From: Laurel Michaels <lmichaels@parelastic.com>
Date: Mon, 2 Jun 2014 14:24:20 -0400
Subject: [PATCH] Fixed nova flavor default list

List of default nova flavors in OpenStack Admin User guide was incorrect.

I updated it with current values.

Also reformatted list as table.

Change-Id: I36ffef04fa4944b1ad42b2ff6b71d7eeb2b48a1a
Closes-Bug: #1325671
---
 .../section_cli_nova_manage_flavors.xml       | 109 ++++++++++++++----
 1 file changed, 88 insertions(+), 21 deletions(-)

diff --git a/doc/user-guide-admin/section_cli_nova_manage_flavors.xml b/doc/user-guide-admin/section_cli_nova_manage_flavors.xml
index 6ae02f2b6e..cc484605e8 100644
--- a/doc/user-guide-admin/section_cli_nova_manage_flavors.xml
+++ b/doc/user-guide-admin/section_cli_nova_manage_flavors.xml
@@ -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>