1 files changed, 122 insertions, 73 deletions

diff --git a/book-enea-nfv-core-installation-guide/doc/installation_instructions.xml b/book-enea-nfv-core-installation-guide/doc/installation_instructions.xml
index 2de6353..0418cde 100644
--- a/book-enea-nfv-core-installation-guide/doc/installation_instructions.xml
+++ b/book-enea-nfv-core-installation-guide/doc/installation_instructions.xml
@@ -373,19 +373,30 @@
       </listitem>
 
       <listitem>
-        <para>In the <literal>Network Setup</literal> section, configure
-        DHCP/Static IP information for your FUEL node. E.g.: ETH0 is
-        10.20.0.2/24 for FUEL booting and ETH1 is DHCP in your corporate/lab
-        network, as shown below.</para>
+        <para>In the <literal>Network Setup</literal> section, configure the
+        network interfaces of the Fuel Master node:</para>
 
         <itemizedlist>
           <listitem>
-            <para>Configure ETH1, the interface to the outside world. In this
-            example ETH1 is configured with 10.0.6.10/24 and the default
-            gateway is 10.0.6.254.</para>
+            <para>eth0 is the interface used by nodes to boot via PXE (Admin
+            network) and eth1 is the interface on the corporate/lab network
+            (Public network).</para>
+          </listitem>
+
+          <listitem>
+            <para>eth0 should be enabled and assigned static IP address
+            10.20.0.2/24, with no gateway.</para>
+          </listitem>
+
+          <listitem>
+            <para>eth1 should be enabled and configured with a static IP
+            address, netmask and gateway on your Public network.</para>
           </listitem>
         </itemizedlist>
 
+        <para>You will access Fuel from your Public network using the IP
+        configured for eth1.</para>
+
         <mediaobject>
           <imageobject>
             <imagedata contentwidth="600" fileref="images/net_setup_1.svg" />
@@ -423,9 +434,8 @@
 
       <listitem>
         <para>In the <literal>Time Sync</literal> section, change the fields
-        shown below to appropriate values. It is strongly advised to avoid
-        using <literal>fuel.pool.ntp.org</literal> and instead set the values
-        to <literal>pool.ntp.org.</literal></para>
+        shown below to appropriate values if needed,
+        <literal>pool.ntp.org</literal> is set by default.</para>
 
         <mediaobject>
           <imageobject>
@@ -654,8 +664,9 @@ $ fuel plugins --install /opt/opnfv/fuel-plugin-kvm-1.0-1.0.0-1.noarch.rpm</prog
       </listitem>
 
       <listitem>
-        <para>Open the networks tab and select <literal>default</literal> in
-        the Node Networks group, on the left side menu:</para>
+        <para>Open the <literal>Networks</literal> tab and select
+        <literal>default</literal> in the <literal>Node Networks</literal>
+        group, on the left side menu:</para>
 
         <mediaobject>
           <imageobject>
@@ -688,9 +699,8 @@ $ fuel plugins --install /opt/opnfv/fuel-plugin-kvm-1.0-1.0.0-1.noarch.rpm</prog
           </listitem>
 
           <listitem>
-            <para>Check &lt;Use VLAN tagging&gt; if needed. For simplicity
-            it&rsquo;s recommended to use the public network in untagged
-            mode.</para>
+            <para>Check &lt;Use VLAN tagging&gt; if needed. For simplicity it
+            is recommended to use the public network in untagged mode.</para>
           </listitem>
 
           <listitem>
@@ -836,20 +846,6 @@ $ fuel plugins --install /opt/opnfv/fuel-plugin-kvm-1.0-1.0.0-1.noarch.rpm</prog
     </orderedlist>
   </section>
 
-  <section id="hypervisor_type">
-    <title>Select Hypervisor type</title>
-
-    <para>Setting the <literal>Hypervisor type</literal> is done in the
-    <literal>Settings</literal> tab by selecting <literal>Compute</literal> on
-    the left side pane, and checking the KVM box:</para>
-
-    <mediaobject>
-      <imageobject>
-        <imagedata contentwidth="600" fileref="images/compute_kvm.svg" />
-      </imageobject>
-    </mediaobject>
-  </section>
-
   <section id="add_rm_repos">
     <title>Adding/Removing Repositories</title>
 
@@ -889,6 +885,20 @@ $ fuel plugins --install /opt/opnfv/fuel-plugin-kvm-1.0-1.0.0-1.noarch.rpm</prog
     </itemizedlist>
   </section>
 
+  <section id="hypervisor_type">
+    <title>Select Hypervisor type</title>
+
+    <para>Setting the <literal>Hypervisor type</literal> is done in the
+    <literal>Settings</literal> tab by selecting <literal>Compute</literal> on
+    the left side pane, and checking the KVM box:</para>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata contentwidth="600" fileref="images/compute_kvm.svg" />
+      </imageobject>
+    </mediaobject>
+  </section>
+
   <section id="storage_plugins_addicomps">
     <title>Storage, Plugins and Additional Components</title>
 
@@ -930,30 +940,25 @@ $ fuel plugins --install /opt/opnfv/fuel-plugin-kvm-1.0-1.0.0-1.noarch.rpm</prog
       <listitem>
         <para>Check the box for <literal>Use Zabbix Datasource in
         Vitrage</literal>:</para>
-
-        <mediaobject>
-          <imageobject>
-            <imagedata contentwidth="600" fileref="images/other.svg" />
-          </imageobject>
-        </mediaobject>
       </listitem>
 
       <listitem>
         <para>Enable and configure the KVM For NFV Plugin.</para>
 
+        <note>
+          <para>Currently the KVM For NFV Plugin is only available for x86
+          architectures. Refer to the <emphasis role="bold">OPNFV
+          KVMforNFV</emphasis> Project for more information.</para>
+        </note>
+
         <mediaobject>
           <imageobject>
-            <imagedata contentwidth="600" fileref="images/KVM_checked.svg" />
+            <imagedata contentwidth="600"
+                       fileref="images/Vitrage_KVM_2.11.svg" />
           </imageobject>
         </mediaobject>
       </listitem>
     </itemizedlist>
-
-    <note>
-      <para>Currently the KVM For NFV Plugin is only available for x86
-      architectures. Refer to the OPNFV KVMforNFV Project for more
-      information.</para>
-    </note>
   </section>
 
   <section id="allocate_nodes_assign_roles">
@@ -978,11 +983,12 @@ $ fuel plugins --install /opt/opnfv/fuel-plugin-kvm-1.0-1.0.0-1.noarch.rpm</prog
 
         <itemizedlist>
           <listitem>
-            <para>Click on the &lt;+Add Nodes&gt; button</para>
+            <para>Click on the <literal>+Add Nodes</literal> button</para>
           </listitem>
 
           <listitem>
-            <para>Check &lt;Controller&gt;, &lt;Telemetry - MongoDB&gt;</para>
+            <para>Check the <literal>Controller, Ceph OSD</literal>
+            roles</para>
           </listitem>
 
           <listitem>
@@ -991,16 +997,16 @@ $ fuel plugins --install /opt/opnfv/fuel-plugin-kvm-1.0-1.0.0-1.noarch.rpm</prog
           </listitem>
 
           <listitem>
-            <para>Click [Apply Changes]</para>
+            <para>Click <literal>Apply Changes</literal></para>
           </listitem>
 
           <listitem>
-            <para>Click on the &lt;+Add Nodes&gt; button</para>
+            <para>Click on the <literal>+Add Nodes</literal> button</para>
           </listitem>
 
           <listitem>
-            <para>Check the &lt;Controller&gt; and &lt;Storage - Ceph OSD&gt;
-            roles.</para>
+            <para>Check <literal>Controller, Telemetry -
+            MongoDB</literal></para>
           </listitem>
 
           <listitem>
@@ -1008,15 +1014,15 @@ $ fuel plugins --install /opt/opnfv/fuel-plugin-kvm-1.0-1.0.0-1.noarch.rpm</prog
           </listitem>
 
           <listitem>
-            <para>Click &lt;Apply Changes&gt;</para>
+            <para>Click <literal>Apply Changes</literal></para>
           </listitem>
 
           <listitem>
-            <para>Click on &lt;+Add Nodes&gt; button</para>
+            <para>Click on <literal>+Add Nodes</literal> button</para>
           </listitem>
 
           <listitem>
-            <para>Check &lt;Controller&gt;</para>
+            <para>Check <literal>Controller, Vitrage</literal></para>
           </listitem>
 
           <listitem>
@@ -1024,26 +1030,25 @@ $ fuel plugins --install /opt/opnfv/fuel-plugin-kvm-1.0-1.0.0-1.noarch.rpm</prog
           </listitem>
 
           <listitem>
-            <para>Click &lt;Apply Changes&gt;</para>
+            <para>Click <literal>Apply Changes</literal></para>
           </listitem>
 
           <listitem>
-            <para>Check the &lt;Compute&gt; and &lt;Storage - Ceph OSD&gt;
-            roles.</para>
+            <para>Check the <literal>Compute, Ceph OSD</literal> roles</para>
           </listitem>
 
           <listitem>
-            <para>Check the Nodes you want to act as Computes from the bottom
+            <para>Check the nodes you want to act as Computes from the bottom
             half of the screen.</para>
           </listitem>
 
           <listitem>
-            <para>Click &lt;Apply Changes&gt;</para>
+            <para>Click <literal>Apply Changes</literal></para>
 
             <mediaobject>
               <imageobject>
                 <imagedata contentwidth="600"
-                           fileref="images/assign_roles.svg" />
+                           fileref="images/Corrected_node_roles_result.svg" />
               </imageobject>
             </mediaobject>
           </listitem>
@@ -1062,7 +1067,7 @@ $ fuel plugins --install /opt/opnfv/fuel-plugin-kvm-1.0-1.0.0-1.noarch.rpm</prog
 
         <itemizedlist>
           <listitem>
-            <para>Select all allocated nodes</para>
+            <para>Select all Controller nodes</para>
           </listitem>
 
           <listitem>
@@ -1150,7 +1155,8 @@ $ fuel plugins --install /opt/opnfv/fuel-plugin-kvm-1.0-1.0.0-1.noarch.rpm</prog
           <listitem>
             <para>Set <literal>Huge Pages</literal> for Nova and DPDK to
             appropriate values and save your settings. It is recommended to
-            use at least 2048 pages of 2MB for both Nova and DPDK.</para>
+            use at least 2048 pages of 2MB for Nova and 2048MB for
+            DPDK.</para>
 
             <mediaobject>
               <imageobject>
@@ -1261,8 +1267,15 @@ $ fuel plugins --install /opt/opnfv/fuel-plugin-kvm-1.0-1.0.0-1.noarch.rpm</prog
 
       <listitem>
         <para>Continue to fix your topology (physical switch, etc.) until the
-        "Verification Succeeded" and "Your network is configured correctly"
-        messages are shown.</para>
+        <literal>Verification succeeded. Your network is configured
+        correctly.</literal> message is shown.</para>
+
+        <mediaobject>
+          <imageobject>
+            <imagedata contentwidth="600"
+                       fileref="images/verification_succeeded.svg" />
+          </imageobject>
+        </mediaobject>
       </listitem>
     </orderedlist>
   </section>
@@ -1273,11 +1286,10 @@ $ fuel plugins --install /opt/opnfv/fuel-plugin-kvm-1.0-1.0.0-1.noarch.rpm</prog
     <para>After the configuration is complete and the network connectivity
     checked, the environment needs to be deployed.</para>
 
-    <para>From the <literal>Dashboard</literal> tab click on
-    <literal>Deploy</literal>. The process should take around 2 hours the
-    first time after a fresh Fuel Master installation. Part of the deploy
-    process is to build the target image, which can take between 30 and 60
-    minutes.</para>
+    <para>From the <literal>Dashboard</literal> tab click on <literal>Deploy
+    Changes</literal>. The process should take around 2 hours the first time
+    after a fresh Fuel Master installation. Part of the deploy process is to
+    build the target image, which can take between 30 and 60 minutes.</para>
 
     <para>The entire deploy process goes through two phases:</para>
 
@@ -1351,9 +1363,45 @@ $ fuel plugins --install /opt/opnfv/fuel-plugin-kvm-1.0-1.0.0-1.noarch.rpm</prog
       </listitem>
 
       <listitem>
+        <para>If DPDK is used, the default flavour
+        <filename>m1.micro</filename> should be modified. </para>
+
+        <para>In order to do this, select Admin|System|Flavors and all flavors
+        will be displayed. Note that <filename>m1.micro</filename> has no
+        metadata. Specific metadata for DPDK will be added.</para>
+
+        <mediaobject>
+          <imageobject>
+            <imagedata contentwidth="600" fileref="images/1-Admin_Flavors.svg" />
+          </imageobject>
+        </mediaobject>
+
+        <para>Click on No under Metadata. The "Update Flavor Metadata" window
+        will appear. Write "hw:mem_page_size" in Custom field and press the
+        plus sign.</para>
+
+        <mediaobject>
+          <imageobject>
+            <imagedata contentwidth="600"
+                       fileref="images/2-Update_Flavour_Metadata_Create.svg" />
+          </imageobject>
+        </mediaobject>
+
+        <para>Now set the value "any" for the "hw:mem_page_size" metadata you
+        created previously and press Save.</para>
+
+        <mediaobject>
+          <imageobject>
+            <imagedata contentwidth="600"
+                       fileref="images/3-Update_Flavour_Metadata_Set.svg" />
+          </imageobject>
+        </mediaobject>
+      </listitem>
+
+      <listitem>
         <para>Select Project|Compute|Instances and all the instances (none in
         this case) will be displayed. Click <literal>Launch Instance</literal>
-        to create a new instance, causing a causing wizard to appear.</para>
+        to create a new instance, causing a wizard to appear.</para>
 
         <mediaobject>
           <imageobject>
@@ -1374,8 +1422,9 @@ $ fuel plugins --install /opt/opnfv/fuel-plugin-kvm-1.0-1.0.0-1.noarch.rpm</prog
       </listitem>
 
       <listitem>
-        <para>The image needed is "Select Boot Source". Add the TestVM image
-        by pressing on the add/plus sign, then press Next.</para>
+        <para>Select <filename>Image</filename> in the <literal>Select Boot
+        Source</literal> in the dropdown list. Add the TestVM image by
+        pressing on the add/plus sign, then press Next.</para>
 
         <mediaobject>
           <imageobject>
@@ -1385,7 +1434,7 @@ $ fuel plugins --install /opt/opnfv/fuel-plugin-kvm-1.0-1.0.0-1.noarch.rpm</prog
       </listitem>
 
       <listitem>
-        <para>Add the <filename>m1.micro</filename> flavor by pressing on the
+        <para>Add the <filename>m1.micro</filename> flavor by clicking on the
         plus sign, then press Next.</para>
 
         <mediaobject>
@@ -1396,8 +1445,8 @@ $ fuel plugins --install /opt/opnfv/fuel-plugin-kvm-1.0-1.0.0-1.noarch.rpm</prog
       </listitem>
 
       <listitem>
-        <para>Add <literal>admin_internal_net</literal> network by pressing on
-        the plus sign and leave the defaults as they are.</para>
+        <para>Add the <literal>admin_internal_net</literal> network by
+        pressing on the plus sign and leave the defaults as they are.</para>
 
         <mediaobject>
           <imageobject>
@@ -1429,7 +1478,7 @@ $ fuel plugins --install /opt/opnfv/fuel-plugin-kvm-1.0-1.0.0-1.noarch.rpm</prog
       </listitem>
 
       <listitem>
-        <para>Repeat the above steps to create the second virtual machine.
+        <para>Repeat the steps above to create the second virtual machine.
         Make a note of the IP addresses allocated:</para>
 
         <mediaobject>