1 files changed, 85 insertions, 48 deletions

diff --git a/book-enea-nfv-core-installation-guide/doc/high_availability.xml b/book-enea-nfv-core-installation-guide/doc/high_availability.xml
index e6dc825..6d27b00 100644
--- a/book-enea-nfv-core-installation-guide/doc/high_availability.xml
+++ b/book-enea-nfv-core-installation-guide/doc/high_availability.xml
@@ -2,18 +2,25 @@
 <chapter id="high_availability">
   <title>High Availability Guide</title>
 
-  <para>Enea NFV Core 1.0 has been designed to provide high availability
-  characteristics that are needed for developing and deploying telco-grade NFV
-  solutions on top of our OPNFV based platform. The High Availability subject
-  in general is very wide and still an important focus in both opensource
-  communities and the independent/proprietary solutions market.</para>
-
-  <para>Enea NFV Core 1.0 aims to initially leverage the efforts in the
-  upstream OPNFV and OpenStack opensource projects, combining solutions from
-  both worlds in an effort to provide flexibility and use-case coverage. Enea
-  has long term expertise and proprietary solutions addressing High
-  Availability for telco applications, which are subject to integration with
-  the NFV based solutions.</para>
+  <para>Enea NFV Core <xi:include
+  href="../../s_docsrc_common/pardoc-distro.xml"
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xpointer="element(EneaNFV_REL_VER/1)" /> has been designed to provide high
+  availability characteristics that are needed for developing and deploying
+  telco-grade NFV solutions on top of our OPNFV based platform. The High
+  Availability subject in general is very wide and still an important focus in
+  both opensource communities and the independent/proprietary solutions
+  market.</para>
+
+  <para>Enea NFV Core <xi:include
+  href="../../s_docsrc_common/pardoc-distro.xml"
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xpointer="element(EneaNFV_REL_VER/1)" /> aims to initially leverage the
+  efforts in the upstream OPNFV and OpenStack opensource projects, combining
+  solutions from both worlds in an effort to provide flexibility and use-case
+  coverage. Enea has long term expertise and proprietary solutions addressing
+  High Availability for telco applications, which are subject to integration
+  with the NFV based solutions.</para>
 
   <section id="levels">
     <title>High Availability Levels</title>
@@ -94,7 +101,10 @@
         communicate with Controllers in order to update the states of the
         virtual and physical resources.</para>
 
-        <para>For this component Enea NFV Core 1.0 makes use of Vitrage, an
+        <para>For this component Enea NFV Core <xi:include
+        href="../../s_docsrc_common/pardoc-distro.xml"
+        xmlns:xi="http://www.w3.org/2001/XInclude"
+        xpointer="element(EneaNFV_REL_VER/1)" /> makes use of Vitrage, an
         OpenStack related project used for Root Cause Analysis. The
         integration into the platform is done with the help of a Fuel Plugin
         which has been developed internally by Enea.</para>
@@ -130,13 +140,16 @@
         can be accessed from one of the servers that act as OpenStack
         Controller nodes.</para>
 
-        <para>In Enea NFV Core 1.0 the Administrator can also access the
-        Zabbix dashboard to perform supplementary configurations. The same
-        applies for the Vitrage tool, which comes with its own Horizon
-        dashboard, enabling the user to visually inspect the faults reported
-        by the monitoring tools through visual representations of the virtual
-        and physical resources, the relationships between them and the fault
-        correlation.</para>
+        <para>In Enea NFV Core <xi:include
+        href="../../s_docsrc_common/pardoc-distro.xml"
+        xmlns:xi="http://www.w3.org/2001/XInclude"
+        xpointer="element(EneaNFV_REL_VER/1)" /> the Administrator can also
+        access the Zabbix dashboard to perform supplementary configurations.
+        The same applies for the Vitrage tool, which comes with its own
+        Horizon dashboard, enabling the user to visually inspect the faults
+        reported by the monitoring tools through visual representations of the
+        virtual and physical resources, the relationships between them and the
+        fault correlation.</para>
 
         <para>For Vitrage, users will usually want to configure additional
         use-cases and describe relationships between components via template
@@ -152,10 +165,13 @@
         the VNFs. The role of the Consumer thus falls to that of a VNF Manager
         and Orchestrator.</para>
 
-        <para>Enea NFV Core 1.0 provides VNF management capabilities using
-        Tacker, which is an OpenStack project that implements a generic VNF
-        Manager and Orchestrator, according to the ETSI MANO Architectural
-        Framework.</para>
+        <para>Enea NFV Core <xi:include
+        href="../../s_docsrc_common/pardoc-distro.xml"
+        xmlns:xi="http://www.w3.org/2001/XInclude"
+        xpointer="element(EneaNFV_REL_VER/1)" /> provides VNF management
+        capabilities using Tacker, which is an OpenStack project that
+        implements a generic VNF Manager and Orchestrator, according to the
+        ETSI MANO Architectural Framework.</para>
       </listitem>
     </itemizedlist>
 
@@ -196,7 +212,11 @@
         </imageobject>
       </mediaobject>
 
-      <para>Enea NFV Core 1.0 uses the same approach described above:</para>
+      <para>Enea NFV Core <xi:include
+      href="../../s_docsrc_common/pardoc-distro.xml"
+      xmlns:xi="http://www.w3.org/2001/XInclude"
+      xpointer="element(EneaNFV_REL_VER/1)" /> uses the same approach
+      described above:</para>
 
       <orderedlist>
         <listitem>
@@ -287,8 +307,11 @@
       </orderedlist>
 
       <note condition="hidden">
-        <para>The ENEA NFV Core 1.0 Pre-Release fully covers the required
-        Doctor functionality only for the Vitrage and Zabbix
+        <para>The ENEA NFV Core <xi:include
+        href="../../s_docsrc_common/pardoc-distro.xml"
+        xmlns:xi="http://www.w3.org/2001/XInclude"
+        xpointer="element(EneaNFV_REL_VER/1)" /> Pre-Release fully covers the
+        required Doctor functionality only for the Vitrage and Zabbix
         components.</para>
       </note>
     </section>
@@ -309,7 +332,9 @@
 
       <para>The Zabbix configuration dashboard is available at the same IP
       address where OpenStack can be reached, e.g.
-      <literal>http://10.0.101.42/zabbix</literal>.</para>
+      <literal>http://10.0.101.42/zabbix</literal>. Default username and
+      password are <literal>admin</literal> and <literal>zabbix</literal>
+      respectively.</para>
 
       <mediaobject>
         <imageobject>
@@ -422,7 +447,10 @@
         </listitem>
 
         <listitem>
-          <para>Next, select the <literal>Media</literal> tab and click
+          <para>Reselect the <literal>admin</literal> alias to enter the
+          <literal>Configuration of Users</literal> screen once again.</para>
+
+          <para>Select the <literal>Media</literal> tab and click
           <literal>Add</literal> to create and modify a new media type. A
           popup menu will appear for <literal>New Media</literal>. Fill each
           field with the values below:</para>
@@ -436,10 +464,10 @@
               <para>Send to: <literal>e.g.
               rabbit://nova:Q1Vt9iocA8OpXKOPoUYOLKie@192.168.0.4:5673/</literal></para>
 
-              <para>You need to search for this in
-              <literal>/etc/vitrage/vitrage.conf or in /etc/nova/nova.conf
-              transport_url</literal>. It is vital that the url contains the
-              ending " / ".</para>
+              <para>This url can be found in either
+              <literal>/etc/vitrage/vitrage.conf or in
+              /etc/nova/nova.conf</literal>. Only one url is needed and it is
+              vital that the url contains the ending " / ".</para>
             </listitem>
 
             <listitem>
@@ -473,7 +501,7 @@
           <literal>Configuration</literal> tab select
           <literal>Actions</literal>. Then, under the
           <literal>Action</literal> tab, fill in the parameter fields with the
-          values below and click <literal>Add</literal></para>
+          values below:</para>
 
           <itemizedlist>
             <listitem>
@@ -538,7 +566,7 @@ lastchange={EVENT.DATE} {EVENT.TIME}</programlisting>
                 </listitem>
 
                 <listitem>
-                  <para>Send to Users: add <literal>Admin</literal></para>
+                  <para>Send to Users: add <literal>admin</literal></para>
                 </listitem>
 
                 <listitem>
@@ -578,7 +606,7 @@ lastchange={EVENT.DATE} {EVENT.TIME}</programlisting>
 
       <para>In order to make use of these features, Vitrage supports
       additional configurations via <literal>yaml</literal> templates that
-      must be placed in <literal>/etc/vitrage/templates</literal> on the nodes
+      must be placed in <literal>/etc/vitrage/templates</literal> on the node
       that have the Vitrage role.</para>
 
       <mediaobject>
@@ -667,8 +695,11 @@ root@node-6:~# systemctl restart vitrage-graph</programlisting>
     <section id="vitrage_custom">
       <title>Vitrage Customizations</title>
 
-      <para>Enea NFV Core 1.0 has added custom features for Vitrage which
-      allow two kinds of actions:</para>
+      <para>Enea NFV Core <xi:include
+      href="../../s_docsrc_common/pardoc-distro.xml"
+      xmlns:xi="http://www.w3.org/2001/XInclude"
+      xpointer="element(EneaNFV_REL_VER/1)" /> has added custom features for
+      Vitrage which allow two kinds of actions:</para>
 
       <orderedlist>
         <listitem>
@@ -866,12 +897,15 @@ RemoteOnline: [ node-4.domain.tld node-5.domain.tld ]</programlisting>
     <section id="pm_fencing">
       <title>Pacemaker Fencing</title>
 
-      <para>ENEA NFV Core 1.0 makes use of the fencing capabilities of
-      Pacemaker to isolate faulty nodes and trigger recovery actions by means
-      of power cycling the failed nodes. Fencing is configured by creating
-      <literal>STONITH</literal> type resources for each of the servers in the
-      cluster, both Controller nodes and Compute nodes. The
-      <literal>STONITH</literal> adapter for fencing the nodes is
+      <para>ENEA NFV Core <xi:include
+      href="../../s_docsrc_common/pardoc-distro.xml"
+      xmlns:xi="http://www.w3.org/2001/XInclude"
+      xpointer="element(EneaNFV_REL_VER/1)" /> makes use of the fencing
+      capabilities of Pacemaker to isolate faulty nodes and trigger recovery
+      actions by means of power cycling the failed nodes. Fencing is
+      configured by creating <literal>STONITH</literal> type resources for
+      each of the servers in the cluster, both Controller nodes and Compute
+      nodes. The <literal>STONITH</literal> adapter for fencing the nodes is
       <literal>fence_ipmilan</literal>, which makes use of the IPMI
       capabilities of the ThunderX servers.</para>
 
@@ -965,9 +999,12 @@ ipaddr=10.0.100.155 login=ADMIN passwd=ADMIN op monitor interval="60s"</programl
     resources capable of identifying failures in compute nodes and can perform
     automatic evacuation of the instances affected by these failures.</para>
 
-    <para>ENEA NFV Core 1.0 aims to validate and integrate this work and to
-    make this feature available in the platform aimed as an alternative to the
-    Doctor framework, where simple, autonomous recovery of running instances
-    is desired.</para>
+    <para>ENEA NFV Core <xi:include
+    href="../../s_docsrc_common/pardoc-distro.xml"
+    xmlns:xi="http://www.w3.org/2001/XInclude"
+    xpointer="element(EneaNFV_REL_VER/1)" /> aims to validate and integrate
+    this work and to make this feature available in the platform aimed as an
+    alternative to the Doctor framework, where simple, autonomous recovery of
+    running instances is desired.</para>
   </section>
 </chapter>
\ No newline at end of file