[docs] Updates for the first Fraser release

Change-Id: I80dfb55c01af89bded1140cd27563d258e05dda4
Signed-off-by: Cristina Pauna <cristina.pauna@enea.com>

5 files changed, 135 insertions, 138 deletions

diff --git a/docs/release/installation/installation.instruction.rst b/docs/release/installation/installation.instruction.rst
index 2b01becdd..acf4aac4b 100644
--- a/docs/release/installation/installation.instruction.rst
+++ b/docs/release/installation/installation.instruction.rst
@@ -6,7 +6,7 @@
 Abstract
 ========
 
-This document describes how to install the Euphrates release of
+This document describes how to install the Fraser release of
 OPNFV when using Fuel as a deployment tool, covering its usage,
 limitations, dependencies and required system resources.
 This is an unified documentation for both x86_64 and aarch64
@@ -18,14 +18,14 @@ Introduction
 ============
 
 This document provides guidelines on how to install and
-configure the Euphrates release of OPNFV when using Fuel as a
+configure the Fraser release of OPNFV when using Fuel as a
 deployment tool, including required software and hardware configurations.
 
 Although the available installation options provide a high degree of
 freedom in how the system is set up, including architecture, services
 and features, etc., said permutations may not provide an OPNFV
 compliant reference architecture. This document provides a
-step-by-step guide that results in an OPNFV Euphrates compliant
+step-by-step guide that results in an OPNFV Fraser compliant
 deployment.
 
 The audience of this document is assumed to have good knowledge of
@@ -35,7 +35,7 @@ networking and Unix/Linux administration.
 Preface
 =======
 
-Before starting the installation of the Euphrates release of
+Before starting the installation of the Fraser release of
 OPNFV, using Fuel as a deployment tool, some planning must be
 done.
 
@@ -69,7 +69,7 @@ Hardware Requirements for Virtual Deploys
 =========================================
 
 The following minimum hardware requirements must be met for the virtual
-installation of Euphrates using Fuel:
+installation of Fraser using Fuel:
 
 +----------------------------+--------------------------------------------------------+
 | **HW Aspect**              | **Requirement**                                        |
@@ -83,7 +83,7 @@ installation of Euphrates using Fuel:
 +----------------------------+--------------------------------------------------------+
 | **RAM**                    | Minimum 32GB/server (Depending on VNF work load)       |
 +----------------------------+--------------------------------------------------------+
-| **Disk**                   | Minimum 100GB (SSD or SCSI (15krpm) highly recommended |
+| **Disk**                   | Minimum 100GB (SSD or SCSI (15krpm) highly recommended)|
 +----------------------------+--------------------------------------------------------+
 
 
@@ -92,7 +92,7 @@ Hardware Requirements for Baremetal Deploys
 ===========================================
 
 The following minimum hardware requirements must be met for the baremetal
-installation of Euphrates using Fuel:
+installation of Fraser using Fuel:
 
 +-------------------------+------------------------------------------------------+
 | **HW Aspect**           | **Requirement**                                      |
@@ -173,7 +173,7 @@ the Fuel OPNFV reference platform. All the networks involved in the OPNFV
 infrastructure as well as the provider networks and the private tenant
 VLANs needs to be manually configured.
 
-Manual configuration of the Euphrates hardware platform should
+Manual configuration of the Fraser hardware platform should
 be carried out according to the `OPNFV Pharos Specification
 <https://wiki.opnfv.org/display/pharos/Pharos+Specification>`_.
 
@@ -185,7 +185,7 @@ The Jumpserver node should be pre-provisioned with an operating system,
 according to the Pharos specification. Relevant network bridges should
 also be pre-configured (e.g. admin_br, mgmt_br, public_br).
 
-- The admin bridge (admin_br) is mandatory for the baremetal nodes PXE booting during fuel installation.
+- The admin bridge (admin_br) is mandatory for the baremetal nodes PXE booting during Fuel installation.
 - The management bridge (mgmt_br) is required for testing suites (e.g. functest/yardstick), it is
   suggested to pre-configure it for debugging purposes.
 - The public bridge (public_br) is also nice to have for debugging purposes, but not mandatory.
@@ -309,17 +309,18 @@ In this figure there are examples of two virtual deploys:
    - Jumphost 2 has a mix of Linux and virsh bridges; When Linux bridge exists for a specified network,
      the deploy script will skip creating a virsh bridge for it
 
-**Note**: A virtual network "mcpcontrol" is always created. For virtual deploys, "mcpcontrol" is also
- used for Admin, leaving the PXE/Admin bridge unused.
+**Note**: A virtual network "mcpcontrol" is always created for initial connection
+of the VMs on Jumphost.
 
 
 Automatic Installation of a Baremetal POD
 =========================================
 
 The baremetal installation process can be done by editing the information about
-hardware and environment in the reclass files, or by using a Pod Descriptor File (PDF).
-This file contains all the information about the hardware and network of the deployment
-the will be fed to the reclass model during deployment.
+hardware and environment in the reclass files, or by using the files Pod Descriptor
+File (PDF) and Installer Descriptor File (IDF) as described in the OPNFV Pharos project.
+These files contain all the information about the hardware and network of the deployment
+that will be fed to the reclass model during deployment.
 
 The installation is done automatically with the deploy script, which will:
 
@@ -362,8 +363,8 @@ In the baremetal deploy all bridges but "mcpcontrol" are Linux bridges. For the
 required to pre-configure at least the admin_br bridge for the PXE/Admin.
 For the targets, the bridges are created by the deploy script.
 
-**Note**: A virtual network "mcpcontrol" is always created. For baremetal deploys, PXE bridge is used
-for baremetal node provisioning, while "mcpcontrol" is used to provision the infrastructure VMs only.
+**Note**: A virtual network "mcpcontrol" is always created for initial connection
+of the VMs on Jumphost.
 
 
 Steps to Start the Automatic Deploy
@@ -387,11 +388,11 @@ These steps are common both for virtual and baremetal deploys.
        $ git clone https://git.opnfv.org/armband
        $ cd armband
 
-#. Checkout the Euphrates release
+#. Checkout the Fraser release
 
    .. code-block:: bash
 
-       $ git checkout opnfv-5.0.2
+       $ git checkout opnfv-6.0.0
 
 #. Start the deploy script
 
@@ -423,15 +424,14 @@ Examples
 
       .. code-block:: bash
 
-         $ ci/deploy.sh -b file:///home/jenkins/tmpdir/securedlab \
-                        -l ericsson \
-                        -p virtual3 \
-                        -s os-nosdn-nofeature-noha \
-                        -D \
-                        -S /home/jenkins/tmpdir |& tee deploy.log
+          $ ci/deploy.sh -l ericsson \
+                         -p virtual3 \
+                         -s os-nosdn-nofeature-noha \
+                         -D \
+                         -S /home/jenkins/tmpdir |& tee deploy.log
 
-   Once the deployment is complete, the OpenStack Dashboard, Horizon is
-   available at http://<controller VIP>:8078, e.g. http://10.16.0.11:8078.
+   Once the deployment is complete, the OpenStack Dashboard, Horizon, is
+   available at http://<controller VIP>:8078
    The administrator credentials are **admin** / **opnfv_secret**.
 
 #. Baremetal deploy
@@ -440,8 +440,7 @@ Examples
 
       .. code-block:: bash
 
-          $ ci/deploy.sh -b file:///home/jenkins/tmpdir/securedlab \
-                         -l lf \
+          $ ci/deploy.sh -l lf \
                          -p pod2 \
                          -s os-nosdn-nofeature-ha \
                          -D \
@@ -453,15 +452,11 @@ Examples
 
          Fuel@OPNFV LF POD2 Network Layout
 
-   Once the deployment is complete, the SaltStack Deployment Documentation is
-   available at http://<Proxy VIP>:8090, e.g. http://172.30.10.103:8090.
-
    An aarch64 deploy on pod5 from Arm lab
 
       .. code-block:: bash
 
-          $ ci/deploy.sh -b file:///home/jenkins/tmpdir/securedlab \
-                         -l arm \
+          $ ci/deploy.sh -l arm \
                          -p pod5 \
                          -s os-nosdn-nofeature-ha \
                          -D \
@@ -473,8 +468,32 @@ Examples
 
          Fuel@OPNFV ARM POD5 Network Layout
 
-Pod Descriptor Files
-====================
+   Once the deployment is complete, the SaltStack Deployment Documentation is
+   available at http://<proxy public VIP>:8090
+
+**NOTE**: The deployment uses the OPNFV Pharos project as input (PDF and IDF files)
+for hardware and network configuration of all current OPNFV PODs.
+When deploying a new POD, one can pass the `-b` flag to the deploy script to override
+the path for the labconfig directory structure containing the PDF and IDF.
+
+   .. code-block:: bash
+
+       $ ci/deploy.sh -b file://<absolute_path_to_labconfig> \
+                      -l <lab_name> \
+                      -p <pod_name> \
+                      -s <scenario> \
+                      -D \
+                      -S <tmp_folder> |& tee deploy.log
+
+   - <absolute_path_to_labconfig> is the absolute path to a local directory, populated
+     similar to Pharos, i.e. PDF/IDF reside in <absolute_path_to_labconfig>/labs/<lab_name>
+   - <lab_name> is the same as the directory in the path above
+   - <pod_name> is the name used for the PDF (<pod_name>.yaml) and IDF (idf-<pod_name>.yaml) files
+
+
+
+Pod and Installer Descriptor Files
+==================================
 
 Descriptor files provide the installer with an abstraction of the target pod
 with all its hardware characteristics and required parameters. This information
@@ -496,7 +515,7 @@ are defined:
 - Network interfaces list including mac address, speed, advanced features and name.
 
 **Note**: The fixed IPs are ignored by the MCP installer script and it will instead
-assign based on the network ranges defined under the pod network configuration.
+assign based on the network ranges defined in IDF.
 
 The Installer Descriptor File extends the PDF with pod related parameters
 required by the installer. This information may differ per each installer type
@@ -507,7 +526,7 @@ structure is available at *mcp/config/labs/local/idf-pod1.yaml*
 The file follows a yaml structure and two sections "net_config" and "fuel" are expected.
 
 The "net_config" section describes all the internal and provider networks
-assigned to the pod. Each network is expected to have a vlan tag, IP subnet and
+assigned to the pod. Each used network is expected to have a vlan tag, IP subnet and
 attached interface on the boards. Untagged vlans shall be defined as "native".
 
 The "fuel" section defines several sub-sections required by the Fuel installer:
@@ -521,9 +540,9 @@ The "fuel" section defines several sub-sections required by the Fuel installer:
   and other DPDK settings. (optional)
 
 The following parameters can be defined in the IDF files under "reclass". Those value will
-overwrite the default configuration values in Fuel repository.
+overwrite the default configuration values in Fuel repository:
 
-- nova_cpu_pinning: List of CPU cores nova will be pinned to.
+- nova_cpu_pinning: List of CPU cores nova will be pinned to. Currently disabled.
 - compute_hugepages_size: Size of each persistent huge pages. Usual values are '2M' and '1G'.
 - compute_hugepages_count: Total number of persistent huge pages.
 - compute_hugepages_mount: Mount point to use for huge pages.
@@ -563,7 +582,7 @@ OPNFV
 
 OpenStack
 
-4) `OpenStack Ocata Release Artifacts <http://www.openstack.org/software/ocata>`_
+4) `OpenStack Pike Release Artifacts <http://www.openstack.org/software/pike>`_
 5) `OpenStack Documentation <http://docs.openstack.org>`_
 
 OpenDaylight
diff --git a/docs/release/release-notes/release-notes.rst b/docs/release/release-notes/release-notes.rst
index 0052ab63f..5ee3bc0ff 100644
--- a/docs/release/release-notes/release-notes.rst
+++ b/docs/release/release-notes/release-notes.rst
@@ -6,7 +6,7 @@
 Abstract
 ========
 
-This document compiles the release notes for the Euphrates release of
+This document compiles the release notes for the Fraser release of
 OPNFV when using Fuel as a deployment tool. This is an unified documentation
 for both x86_64 and aarch64 architectures. All information is common for
 both architectures except when explicitly stated.
@@ -17,9 +17,9 @@ Important Notes
 ===============
 
 These notes provides release information for the use of Fuel as deployment
-tool for the Euphrates release of OPNFV.
+tool for the Fraser release of OPNFV.
 
-The goal of the Euphrates release and this Fuel-based deployment process is
+The goal of the Fraser release and this Fuel-based deployment process is
 to establish a lab ready platform accelerating further development
 of the OPNFV infrastructure.
 
@@ -29,7 +29,7 @@ Carefully follow the installation-instructions.
 Summary
 =======
 
-For Euphrates, the typical use of Fuel as an OpenStack installer is
+For Fraser, the typical use of Fuel as an OpenStack installer is
 supplemented with OPNFV unique components such as:
 
 - `OpenDaylight <http://www.opendaylight.org/software>`_
@@ -37,7 +37,7 @@ supplemented with OPNFV unique components such as:
 
 As well as OPNFV-unique configurations of the Hardware and Software stack.
 
-This Euphrates artifact provides Fuel as the deployment stage tool in the
+This Fraser artifact provides Fuel as the deployment stage tool in the
 OPNFV CI pipeline including:
 
 - Documentation built by Jenkins
@@ -48,10 +48,10 @@ OPNFV CI pipeline including:
 
   - installation instructions
 
-- Automated deployment of Euphrates with running on bare metal or a nested
+- Automated deployment of Fraser with running on baremetal or a nested
   hypervisor environment (KVM)
 
-- Automated validation of the Euphrates deployment
+- Automated validation of the Fraser deployment
 
 ============
 Release Data
@@ -61,22 +61,23 @@ Release Data
 | **Project**                          | fuel/armband                         |
 |                                      |                                      |
 +--------------------------------------+--------------------------------------+
-| **Repo/tag**                         | opnfv-5.1.0                          |
+| **Repo/tag**                         | opnfv-6.0.0                          |
 |                                      |                                      |
 +--------------------------------------+--------------------------------------+
-| **Release designation**              | Euphrates 5.1                        |
+| **Release designation**              | Fraser 6.0                           |
 |                                      |                                      |
 +--------------------------------------+--------------------------------------+
-| **Release date**                     | December 15 2017                     |
+| **Release date**                     | April 27 2018                        |
 |                                      |                                      |
 +--------------------------------------+--------------------------------------+
-| **Purpose of the delivery**          | Euphrates alignment to Released      |
-|                                      | MCP 1.0 baseline + features and      |
+| **Purpose of the delivery**          | Fraser alignment to Released         |
+|                                      | MCP baseline + features and          |
 |                                      | bug-fixes for the following          |
 |                                      | feaures:                             |
 |                                      |                                      |
 |                                      | - Open vSwitch for NFV               |
 |                                      | - OpenDaylight                       |
+|                                      | - DPDK                               |
 +--------------------------------------+--------------------------------------+
 
 Version Change
@@ -84,25 +85,25 @@ Version Change
 
 Module Version Changes
 ----------------------
-This is the Euphrates 5.1 release.
+This is the Fraser 6.0 release.
 It is based on following upstream versions:
 
-- MCP 1.0 Base Release
+- MCP Base Release
 
-- OpenStack Ocata Release
+- OpenStack Pike Release
 
-- OpenDaylight
+- OpenDaylight Oxygen Release
 
 Document Changes
 ----------------
-This is the Euphrates 5.1 release.
+This is the Fraser 6.0 release.
 It comes with the following documentation:
 
-- `Installation instructions <http://docs.opnfv.org/en/stable-euphrates/submodules/armband/docs/release/installation/installation.instruction.html>`_
+- :ref:`fuel-release-installation-label`
 
 - Release notes (This document)
 
-- `User guide <http://docs.opnfv.org/en/stable-euphrates/submodules/fuel/docs/release/userguide/userguide.html>`_
+- :ref:`fuel-release-userguide-label`
 
 Reason for Version
 ==================
@@ -111,14 +112,14 @@ Feature Additions
 -----------------
 
 **JIRA TICKETS:**
-`Euphrates 5.1 new features  <https://jira.opnfv.org/issues/?filter=12114>`_
+`Fraser 6.0 new features  <https://jira.opnfv.org/issues/?filter=12302>`_
 
 Bug Corrections
 ---------------
 
 **JIRA TICKETS:**
 
-`Euphrates 5.1 bug fixes  <https://jira.opnfv.org/issues/?filter=12115>`_
+`Fraser 6.0 bug fixes  <https://jira.opnfv.org/issues/?filter=12303>`_
 
 (Also See respective Integrated feature project's bug tracking)
 
@@ -135,12 +136,11 @@ Software Deliverables
 Documentation Deliverables
 --------------------------
 
-- `Installation instructions <http://docs.opnfv.org/en/stable-euphrates/submodules/armband/docs/release/installation/installation.instruction.html>`_
+- :ref:`fuel-release-installation-label`
 
 - Release notes (This document)
 
-- `User guide <http://docs.opnfv.org/en/stable-euphrates/submodules/fuel/docs/release/userguide/userguide.html>`_
-
+- :ref:`fuel-release-userguide-label`
 
 =========================================
 Known Limitations, Issues and Workarounds
@@ -163,7 +163,7 @@ Known Issues
 
 **JIRA TICKETS:**
 
-`Known issues <https://jira.opnfv.org/issues/?filter=12116>`_
+`Known issues <https://jira.opnfv.org/issues/?filter=12304>`_
 
 (Also See respective Integrated feature project's bug tracking)
 
@@ -179,13 +179,13 @@ Workarounds
 ============
 Test Results
 ============
-The Euphrates 5.1 release with the Fuel deployment tool has undergone QA test
+The Fraser 6.0 release with the Fuel deployment tool has undergone QA test
 runs, see separate test results.
 
 ==========
 References
 ==========
-For more information on the OPNFV Euphrates 5.1 release, please see:
+For more information on the OPNFV Fraser 6.0 release, please see:
 
 OPNFV
 =====
@@ -197,7 +197,7 @@ OPNFV
 OpenStack
 =========
 
-4) `OpenStack Ocata Release Artifacts <http://www.openstack.org/software/ocata>`_
+4) `OpenStack Pike Release Artifacts <http://www.openstack.org/software/pike>`_
 
 5) `OpenStack Documentation <http://docs.openstack.org>`_
 
diff --git a/docs/release/scenarios/os-nosdn-ovs-ha/os-nosdn-ovs-ha.rst b/docs/release/scenarios/os-nosdn-ovs-ha/os-nosdn-ovs-ha.rst
index 5e30ab542..c51a5f5b8 100644
--- a/docs/release/scenarios/os-nosdn-ovs-ha/os-nosdn-ovs-ha.rst
+++ b/docs/release/scenarios/os-nosdn-ovs-ha/os-nosdn-ovs-ha.rst
@@ -2,14 +2,14 @@
 .. http://creativecommons.org/licenses/by/4.0
 .. (c)2017 Mirantis Inc., Enea Software AB and others
 
-This document provides scenario level details for Euphrates 5.0 of
+This document provides scenario level details for Fraser 6.0 of
 deployment with no SDN controller and no extra features enabled.
 
 ============
 Introduction
 ============
 
-This scenario is used primarily to validate and deploy a Ocata OpenStack
+This scenario is used primarily to validate and deploy a Pike OpenStack
 deployment without any NFV features or SDN controller enabled.
 
 Scenario components and composition
@@ -38,5 +38,5 @@ None
 References
 ==========
 
-For more information on the OPNFV Euphrates release, please visit
-http://www.opnfv.org/euphrates
+For more information on the OPNFV Fraser release, please visit
+http://www.opnfv.org/software
diff --git a/docs/release/scenarios/os-nosdn-ovs-noha/os-nosdn-ovs-noha.rst b/docs/release/scenarios/os-nosdn-ovs-noha/os-nosdn-ovs-noha.rst
index 7ac4e111a..99c4de041 100644
--- a/docs/release/scenarios/os-nosdn-ovs-noha/os-nosdn-ovs-noha.rst
+++ b/docs/release/scenarios/os-nosdn-ovs-noha/os-nosdn-ovs-noha.rst
@@ -2,14 +2,14 @@
 .. http://creativecommons.org/licenses/by/4.0
 .. (c) 2017 Mirantis Inc., Enea Software AB and others
 
-This document provides scenario level details for Euphrates 5.0 of
+This document provides scenario level details for Fraser 6.0 of
 deployment with no SDN controller and no extra features enabled.
 
 ============
 Introduction
 ============
 
-This scenario is used primarily to validate and deploy a Ocata OpenStack
+This scenario is used primarily to validate and deploy a Pike OpenStack
 deployment without any NFV features or SDN controller enabled.
 
 
@@ -24,7 +24,7 @@ the DPDK-enabled Open vSwitch component.
 Scenario usage overview
 =======================
 
-Simply deploy this scenario by using the os-nosdn-ovs-ha.yaml deploy
+Simply deploy this scenario by using the os-nosdn-ovs-noha.yaml deploy
 settings file.
 
 
@@ -36,6 +36,5 @@ Tested on virtual deploy only.
 References
 ==========
 
-For more information on the OPNFV Euphrates release, please visit
-http://www.opnfv.org/euphrates
-
+For more information on the OPNFV Fraser release, please visit
+http://www.opnfv.org/software
diff --git a/docs/release/userguide/userguide.rst b/docs/release/userguide/userguide.rst
index afa1f224b..fd9dfa736 100644
--- a/docs/release/userguide/userguide.rst
+++ b/docs/release/userguide/userguide.rst
@@ -6,9 +6,9 @@
 Abstract
 ========
 
-This document contains details about how to use OPNFV Fuel - Euphrates
+This document contains details about how to use OPNFV Fuel - Fraser
 release - after it was deployed. For details on how to deploy check the
-installation instructions in the :ref:`references` section.
+installation instructions in the :ref:`fuel_userguide_references` section.
 
 This is an unified documentation for both x86_64 and aarch64
 architectures. All information is common for both architectures
@@ -22,26 +22,25 @@ Network Overview
 
 Fuel uses several networks to deploy and administer the cloud:
 
-+------------------+-------------------+---------------------------------------------------------+
-| Network name     | Deploy Type       | Description                                             |
-|                  |                   |                                                         |
-+==================+===================+=========================================================+
-| **PXE/ADMIN**    | baremetal only    | Used for booting the nodes via PXE                      |
-+------------------+-------------------+---------------------------------------------------------+
-| **MCPCONTROL**   | baremetal &       | Used to provision the infrastructure VMs (Salt & MaaS). |
-|                  | virtual           | On virtual deploys, it is used for Admin too (on target |
-|                  |                   | VMs) leaving the PXE/Admin bridge unused                |
-+------------------+-------------------+---------------------------------------------------------+
-| **Mgmt**         | baremetal &       | Used for internal communication between                 |
-|                  | virtual           | OpenStack components                                    |
-+------------------+-------------------+---------------------------------------------------------+
-| **Internal**     | baremetal &       | Used for VM data communication within the               |
-|                  | virtual           | cloud deployment                                        |
-+------------------+-------------------+---------------------------------------------------------+
-| **Public**       | baremetal &       | Used to provide Virtual IPs for public endpoints        |
-|                  | virtual           | that are used to connect to OpenStack services APIs.    |
-|                  |                   | Used by Virtual machines to access the Internet         |
-+------------------+-------------------+---------------------------------------------------------+
++------------------+---------------------------------------------------------+
+| Network name     | Description                                             |
+|                  |                                                         |
++==================+=========================================================+
+| **PXE/ADMIN**    | Used for booting the nodes via PXE and/or Salt          |
+|                  | control network                                         |
++------------------+---------------------------------------------------------+
+| **MCPCONTROL**   | Used to provision the infrastructure VMs (Salt & MaaS)  |
++------------------+---------------------------------------------------------+
+| **Mgmt**         | Used for internal communication between                 |
+|                  | OpenStack components                                    |
++------------------+---------------------------------------------------------+
+| **Internal**     | Used for VM data communication within the               |
+|                  | cloud deployment                                        |
++------------------+---------------------------------------------------------+
+| **Public**       | Used to provide Virtual IPs for public endpoints        |
+|                  | that are used to connect to OpenStack services APIs.    |
+|                  | Used by Virtual machines to access the Internet         |
++------------------+---------------------------------------------------------+
 
 
 These networks - except mcpcontrol - can be linux bridges configured before the deploy on the
@@ -66,21 +65,15 @@ ssh key */var/lib/opnfv/mcp.rsa*. The example below is a connection to Salt mast
 
 **Note**: The Salt master IP is not hard set, it is configurable via INSTALLER_IP during deployment
 
-
-The Fuel baremetal deploy has a Virtualized Control Plane (VCP) which means that the controller
-services are installed in VMs on the baremetal targets (kvm servers). These VMs can also be
-accessed with virsh console: user *opnfv*, password *opnfv_secret*. This method does not apply
-to infrastructure VMs (Salt master and MaaS).
-
-The example below is a connection to a controller VM. The connection is made from the baremetal
-server kvm01.
+Logging in to cluster nodes is possible from the Jumpserver and from Salt master. On the Salt master
+cluster hostnames can be used instead of IP addresses:
 
     .. code-block:: bash
 
-        $ ssh -o StrictHostKeyChecking=no -i  /var/lib/opnfv/mcp.rsa  -l ubuntu x.y.z.141
-        ubuntu@kvm01:~$ virsh console ctl01
+        $ sudo -i
+        $ ssh -i mcp.rsa ubuntu@ctl01
 
-User *ubuntu* has sudo rights. User *opnfv* has sudo rights only on aarch64 deploys.
+User *ubuntu* has sudo rights.
 
 
 =============================
@@ -96,10 +89,10 @@ For example tell salt to execute a ping to 8.8.8.8 on all the nodes.
 .. figure:: img/saltstack.png
 
 Complex filters can be done to the target like compound queries or node roles.
-For more information about Salt see the :ref:`references` section.
+For more information about Salt see the :ref:`fuel_userguide_references` section.
 
 Some examples are listed below. Note that these commands are issued from Salt master
-with *root* user.
+as *root* user.
 
 
 #. View the IPs of all the components
@@ -107,10 +100,10 @@ with *root* user.
     .. code-block:: bash
 
         root@cfg01:~$ salt "*" network.ip_addrs
-        cfg01.baremetal-mcp-ocata-odl-ha.local:
+        cfg01.mcp-pike-odl-ha.local:
            - 10.20.0.2
            - 172.16.10.100
-        mas01.baremetal-mcp-ocata-odl-ha.local:
+        mas01.mcp-pike-odl-ha.local:
            - 10.20.0.3
            - 172.16.10.3
            - 192.168.11.3
@@ -123,7 +116,7 @@ with *root* user.
 
         root@cfg01:~$ salt "*" network.interfaces --out yaml --output-file interfaces.yaml
         root@cfg01:~# cat interfaces.yaml
-        cfg01.baremetal-mcp-ocata-odl-ha.local:
+        cfg01.mcp-pike-odl-ha.local:
          enp1s0:
            hwaddr: 52:54:00:72:77:12
            inet:
@@ -144,7 +137,7 @@ with *root* user.
     .. code-block:: bash
 
         root@cfg01:~# salt "mas*" pkg.list_pkgs
-        mas01.baremetal-mcp-ocata-odl-ha.local:
+        mas01.mcp-pike-odl-ha.local:
             ----------
             accountsservice:
                 0.6.40-2ubuntu11.3
@@ -164,7 +157,7 @@ with *root* user.
     .. code-block:: bash
 
         root@cfg01:~# salt "*" cmd.run 'ls /var/log'
-        cfg01.baremetal-mcp-ocata-odl-ha.local:
+        cfg01.mcp-pike-odl-ha.local:
            alternatives.log
            apt
            auth.log
@@ -180,7 +173,7 @@ with *root* user.
     .. code-block:: bash
 
         root@cfg01:~# salt -C '* and cfg01*' cmd.run 'ls /var/log'
-        cfg01.baremetal-mcp-ocata-odl-ha.local:
+        cfg01.mcp-pike-odl-ha.local:
            alternatives.log
            apt
            auth.log
@@ -196,7 +189,7 @@ with *root* user.
     .. code-block:: bash
 
         root@cfg01:~# salt -I 'nova:compute' cmd.run 'ls /var/log'
-        cmp001.baremetal-mcp-ocata-odl-ha.local:
+        cmp001.mcp-pike-odl-ha.local:
            alternatives.log
            apache2
            apt
@@ -229,7 +222,7 @@ Openstack credentials are at */root/keystonercv3*.
         +--------------------------------------+-----------------------------------------------+--------+
 
 
-The OpenStack Dashboard, Horizon is available at http://<controller VIP>:8078, e.g. http://10.16.0.11:8078.
+The OpenStack Dashboard, Horizon, is available at http://<proxy public VIP>
 The administrator credentials are *admin*/*opnfv_secret*.
 
 .. figure:: img/horizon_login.png
@@ -239,20 +232,6 @@ A full list of IPs/services is available at <proxy public VIP>:8090 for baremeta
 
 .. figure:: img/salt_services_ip.png
 
-For Virtual deploys, the most commonly used IPs are in the table below.
-
-+-----------+--------------+---------------+
-| Component | IP           | Default value |
-+===========+==============+===============+
-| gtw01     | x.y.z.124    | 172.16.10.124 |
-+-----------+--------------+---------------+
-| ctl01     | x.y.z.11     | 172.16.10.11  |
-+-----------+--------------+---------------+
-| cmp001    | x.y.z.101    | 172.16.10.101 |
-+-----------+--------------+---------------+
-| cmp002    | x.y.z.102    | 172.16.10.102 |
-+-----------+--------------+---------------+
-
 ==============================
 Guest Operating System Support
 ==============================
@@ -384,12 +363,12 @@ After the installation is done, a webbrowser on the host can be used to view the
    .. figure:: img/reclass_doc.png
 
 
-.. _references:
+.. _fuel_userguide_references:
 
 ==========
 References
 ==========
 
-1) `Installation instructions <http://docs.opnfv.org/en/stable-euphrates/submodules/fuel/docs/release/installation/installation.instruction.html>`_
+1) :ref:`fuel-release-installation-label`
 2) `Saltstack Documentation <https://docs.saltstack.com/en/latest/topics>`_
-3) `Saltstack Formulas <http://salt-formulas.readthedocs.io/en/latest/develop/overview-reclass.html>`_
+3) `Saltstack Formulas <http://salt-formulas.readthedocs.io/en/latest/>`_