1 files changed, 63 insertions, 106 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 2b89490..fe93e1a 100644
--- a/book-enea-nfv-core-installation-guide/doc/installation_instructions.xml
+++ b/book-enea-nfv-core-installation-guide/doc/installation_instructions.xml
@@ -19,8 +19,9 @@
   Armband project is out of the scope of this document but information is
   available online on the OPNFV wiki.</para>
 
-  <para>The OPNFV download page provides general instructions for building and
-  installing the Fuel Installer .iso and also on how to deploy OPNFV Danube
+  <para>The <ulink url="https://www.opnfv.org/software/downloads">OPNFV
+  download page</ulink> provides general instructions for building and
+  installing the Fuel Installer ISO and also on how to deploy OPNFV Danube
   using Fuel on a Pharos compliant test lab.</para>
 
   <note>
@@ -43,8 +44,8 @@
   <section id="other-preparations">
     <title>Other Preparations</title>
 
-    <para>Reading the following addition and optional documents aides in
-    familiarizing yourself with Fuel:</para>
+    <para>Reading the following documents aides in familiarizing yourself with
+    Fuel:</para>
 
     <itemizedlist>
       <listitem>
@@ -62,13 +63,13 @@
       <listitem>
         <para><ulink
         url="https://docs.openstack.org/fuel-docs/latest/devdocs/develop.html">Fuel
-        Developer Guide</ulink></para>
+        Developer Guide</ulink> (optional)</para>
       </listitem>
 
       <listitem>
         <para><ulink
         url="http://docs.openstack.org/developer/fueldocs/plugindocs/fuel-plugin-sdk-guide.html">Fuel
-        Plugin Developers Guide</ulink></para>
+        Plugin Developers Guide</ulink> (optional)</para>
       </listitem>
 
       <listitem>
@@ -101,7 +102,8 @@
       </listitem>
 
       <listitem>
-        <para>Network overlay you plan to deploy (VLAN, VXLAN, FLAT)</para>
+        <para>Network overlay planned for deployment (VLAN, VXLAN, FLAT). Only
+        VLAN is supported in this release.</para>
       </listitem>
 
       <listitem>
@@ -306,7 +308,7 @@
 
         <mediaobject>
           <imageobject>
-            <imagedata contentwidth="600" fileref="images/dns.svg" />
+            <imagedata contentwidth="610" fileref="images/dns.svg" />
           </imageobject>
         </mediaobject>
       </listitem>
@@ -331,23 +333,14 @@
       </listitem>
 
       <listitem>
-        <para>Enable Experimental features:</para>
-
-        <itemizedlist>
-          <listitem>
-            <para>In the <literal>Feature groups</literal> section, enable the
-            checkbox for <literal>Experimental</literal> features.</para>
-          </listitem>
-
-          <listitem>
-            <para>Move to the &lt;Apply&gt; button and press
-            &lt;Enter&gt;</para>
-          </listitem>
-        </itemizedlist>
+        <para>In the <literal>Feature groups</literal> section, enable the
+        checkbox for <literal>Experimental</literal> features. Move to the
+        &lt;Apply&gt; button and press &lt;Enter&gt;</para>
 
         <mediaobject>
           <imageobject>
-            <imagedata contentwidth="600" fileref="images/experimental.svg" />
+            <imagedata contentwidth="600" fileref="images/experimental.svg"
+                       format="SVG" />
           </imageobject>
         </mediaobject>
       </listitem>
@@ -385,8 +378,8 @@
         <para>Enable PXE booting:</para>
 
         <para>For every controller and compute server, enable PXE Booting as
-        the first boot device in the UEFI (EDK2) boot order menu, with the
-        hard disk as the second boot device in the same menu.</para>
+        the first boot device in the BIOS boot menu (for x86) or UEFI boot
+        order menu (for aarch64).</para>
       </listitem>
 
       <listitem>
@@ -394,21 +387,18 @@
       </listitem>
 
       <listitem>
+        <para>Connect to the FUEL UI via the URL provided in the Console
+        (default: https://10.20.0.2:8443)</para>
+      </listitem>
+
+      <listitem>
         <para>Wait for the availability of nodes to appear in the Fuel
         GUI.</para>
+      </listitem>
 
-        <itemizedlist>
-          <listitem>
-            <para>Connect to the FUEL UI via the URL provided in the Console
-            (default: https://10.20.0.2:8443)</para>
-          </listitem>
-
-          <listitem>
-            <para>Wait until all nodes are displayed in top right corner of
-            the Fuel GUI: Total nodes and Unallocated nodes (see figure
-            below).</para>
-          </listitem>
-        </itemizedlist>
+      <listitem>
+        <para>Wait until all nodes are displayed in top right corner of the
+        Fuel GUI: Total nodes and Unallocated nodes (see figure below).</para>
 
         <mediaobject>
           <imageobject role="fo">
@@ -441,6 +431,10 @@
       <listitem>
         <para>Tacker VNF Manager</para>
       </listitem>
+
+      <listitem>
+        <para>KVM For NFV Plugin</para>
+      </listitem>
     </itemizedlist>
 
     <para>Login to the Fuel Master via <literal>ssh</literal> using the
@@ -449,7 +443,8 @@
 
     <programlisting>$ fuel plugins --install /opt/opnfv/vitrage-1.0-1.0.4-1.noarch.rpm
 $ fuel plugins --install zabbix_monitoring-2.5-2.5.3-1.noarch.rpm
-$ fuel plugins --install tacker-1.0-1.0.0-1.noarch.rpm</programlisting>
+$ fuel plugins --install tacker-1.0-1.0.0-1.noarch.rpm
+$ fuel plugins --install /opt/opnfv/fuel-plugin-kvm-1.0-1.0.0-1.noarch.rpm</programlisting>
 
     <para>Expected output: <programlisting>Plugin ....... was successfully installed.</programlisting></para>
   </section>
@@ -472,8 +467,10 @@ $ fuel plugins --install tacker-1.0-1.0.0-1.noarch.rpm</programlisting>
       </listitem>
 
       <listitem>
-        <para>Select &rdquor;aarch64 or x86_64&rdquo; and press
-        &lt;Next&gt;</para>
+        <para>Only Debian 9 is supported in this release. Select
+        <filename>Newton on Debian 9 (x86_64)</filename> or <filename>Newton
+        on Debian 9 (aarch64)</filename> depending on your
+        configuration:</para>
 
         <mediaobject>
           <imageobject>
@@ -489,23 +486,10 @@ $ fuel plugins --install tacker-1.0-1.0.0-1.noarch.rpm</programlisting>
       </listitem>
 
       <listitem>
-        <para>Select <literal>network mode</literal>:</para>
-
-        <itemizedlist>
-          <listitem>
-            <para>Select <literal>Neutron with ML2 plugin</literal></para>
-          </listitem>
-
-          <listitem>
-            <para>Select <literal>Neutron with VLAN segmentation</literal>
-            (needed when enabling DPDK). VXLAN is available but not
-            supported.</para>
-          </listitem>
-
-          <listitem>
-            <para>Press [Next]</para>
-          </listitem>
-        </itemizedlist>
+        <para>Select <filename>Neutron With VLAN segmenation</filename>.
+        <filename>Neutron with tunneling segmentation</filename> is available
+        but not supported in this release. DPDK scenarios only work with VLAN
+        segmentation.</para>
 
         <mediaobject>
           <imageobject>
@@ -516,7 +500,12 @@ $ fuel plugins --install tacker-1.0-1.0.0-1.noarch.rpm</programlisting>
 
       <listitem>
         <para>Select <literal>Storage Back-ends</literal>, then <filename>Ceph
-        for block storage</filename> and press [Next]</para>
+        for block storage</filename>. <literal></literal></para>
+
+        <para><literal>Ceph</literal> for <filename>Image Storage</filename>,
+        <literal>Object storage</literal> and <literal>Ephemeral
+        storage</literal> have not been validated for this release. It is
+        advisable to only use the option mentioned above.</para>
 
         <mediaobject>
           <imageobject>
@@ -548,8 +537,8 @@ $ fuel plugins --install tacker-1.0-1.0.0-1.noarch.rpm</programlisting>
   <section id="config_net_env">
     <title>Configure the Network Environment</title>
 
-    <para>To configure the network environment specifically to a DPDK based
-    scenario, please follow these steps:</para>
+    <para>To configure the network environment, please follow these
+    steps:</para>
 
     <orderedlist>
       <listitem>
@@ -655,34 +644,6 @@ $ fuel plugins --install tacker-1.0-1.0.0-1.noarch.rpm</programlisting>
       </listitem>
 
       <listitem>
-        <para>Update the Private Network information:</para>
-
-        <itemizedlist>
-          <listitem>
-            <para>It is recommended to keep the default CIDR</para>
-          </listitem>
-
-          <listitem>
-            <para>Set IP Range Start to an appropriate value (default
-            192.168.2.1)</para>
-          </listitem>
-
-          <listitem>
-            <para>Set IP Range End to an appropriate value (default
-            192.168.2.254)</para>
-          </listitem>
-
-          <listitem>
-            <para>Check &lt;VLAN tagging&gt;</para>
-          </listitem>
-
-          <listitem>
-            <para>Set an appropriate VLAN tag (default 103)</para>
-          </listitem>
-        </itemizedlist>
-      </listitem>
-
-      <listitem>
         <para>Select the <literal>Neutron L3</literal> Node Networks group on
         the left pane:</para>
 
@@ -780,24 +741,19 @@ $ fuel plugins --install tacker-1.0-1.0.0-1.noarch.rpm</programlisting>
   <section id="add_rm_repos">
     <title>Adding/Removing Repositories</title>
 
-    <para>Fuel by default, uses a set of repositories as package sources, that
-    hold both OpenStack components as well as other needed packages. In order
-    to speed up the deployment process, Fuel will create two mirrors. The
-    first, a local mirror, reachable on the Admin interface (e.g.
-    <literal>10.20.0.2:8080/newton-10.0/ubuntu/x86-64</literal>), will add
-    additional repositories that need external connections. The second, a
-    debian testing main:
-    <literal>http://10.20.0.2:8080/mirrors/debian</literal>, requires no other
-    repositories to be added that need external connections, having only (even
-    for offline): <filename>debian-testing-local</filename> and
-    <literal>mos</literal>.</para>
-
-    <para>It is possible to avoid using external repositories and make the
-    entire process completely offline. In this way only the most basic
-    packages will be installed, but the process will be more efficient and not
-    depend on an Internet connection. To do this, just make sure that the
-    Repositories list contains only <filename>ubuntu-local</filename>,
-    <literal>mos</literal> and <literal>Auxilliary</literal>.</para>
+    <para>Enea NFV Core has been validated for complete offline deployment. To
+    this end, two repositories are defined and used. The first,
+    <literal>debian-testing-local</literal> (<filename>deb
+    http://10.20.0.2:8080/mirrors/debian testing main</filename>), contains a
+    snapshot of the Debian base OS, while the second, <literal>mos</literal>,
+    (<literal>deb http://10.20.0.2:8080/newton-10.0/ubuntu/x86_64 mos10.0 main
+    restricted</literal>), stores the Enea NFV Core specific Openstack and
+    Openstack related packages.</para>
+
+    <para>These repositories provide only the minimum necessary packages, but
+    it is possible to add extra repositories as needed. It is recommended
+    however, that the first deployment be performed without extra
+    repositories.</para>
 
     <itemizedlist>
       <listitem>
@@ -827,7 +783,8 @@ $ fuel plugins --install tacker-1.0-1.0.0-1.noarch.rpm</programlisting>
     <para>In the FUEL UI of your Environment, click the
     <literal>Settings</literal> tab and select <literal>OpenStack
     Services</literal> on the left side pane, make sure Tacker is NOT enabled
-    and save your settings:</para>
+    and save your settings. Tacker functionality will be enabled after
+    deployment is performed.</para>
 
     <mediaobject>
       <imageobject>