Final documenatation updates for Euphrates

Updates release notes as well as nosdn scenarios description.

Change-Id: Ie061f8b371a94df0baca2655c960a5fda133266b
Signed-off-by: juraj.linkes <jlinkes@cisco.com>
(cherry picked from commit 3e93206b58c52b1a6aea05ec4faae80c9715534d)

4 files changed, 132 insertions, 369 deletions

diff --git a/docs/release/release-notes/fds-release.rst b/docs/release/release-notes/fds-release.rst
index dfb68b0..9b01d27 100644
--- a/docs/release/release-notes/fds-release.rst
+++ b/docs/release/release-notes/fds-release.rst
@@ -6,16 +6,16 @@
 License
 =======
 
-OPNFV Danube release note for Functest Docs
+OPNFV Euphrates release notes for FastDataStacks
 
-OPNFV Danube release note for Functest Docs
+OPNFV Euphrates release notes for FastDataStacks
 are licensed under a Creative Commons Attribution 4.0 International License.
 You should have received a copy of the license along with this.
 If not, see <http://creativecommons.org/licenses/by/4.0/>.
 
-===============================================
-OPNFV Danube3.0 release note for FastDataStacks
-===============================================
+===================================================
+OPNFV Euphrates release notes for FastDataStacks
+===================================================
 
 Abstract
 ========
@@ -26,23 +26,26 @@ This document describes the release notes of FastDataStacks project.
 Version history
 ===============
 
-+------------+----------+------------------+---------------------------+
-| **Date**   | **Ver.** | **Author**       | **Comment**               |
-|            |          |                  |                           |
-+------------+----------+------------------+---------------------------+
-| 2017-03-30 | 1.0.0    | Frank Brockners  | FastDataStacks for Danube |
-|            |          | (Cisco)          | 1.0 release               |
-+------------+----------+------------------+---------------------------+
-| 2017-05-02 | 2.0.0    | Frank Brockners  | FastDataStacks for Danube |
-|            |          | (Cisco)          | 2.0 release               |
-+------------+----------+------------------+---------------------------+
-| 2017-07-13 | 3.0.0    | Juraj Linkes     | FastDataStacks for Danube |
-|            |          | (Cisco)          | 3.0 release               |
-+------------+----------+------------------+---------------------------+
++------------+----------+------------------+------------------------------+
+| **Date**   | **Ver.** | **Author**       | **Comment**                  |
+|            |          |                  |                              |
++------------+----------+------------------+------------------------------+
+| 2017-10-18 | 4.0.0    | Juraj Linkes     | FastDataStacks for Euphrates |
+|            |          | (Cisco)          | release                      |
++------------+----------+------------------+------------------------------+
+| 2017-07-13 | 3.0.0    | Juraj Linkes     | FastDataStacks for Danube    |
+|            |          | (Cisco)          | 3.0 release                  |
++------------+----------+------------------+------------------------------+
+| 2017-05-02 | 2.0.0    | Frank Brockners  | FastDataStacks for Danube    |
+|            |          | (Cisco)          | 2.0 release                  |
++------------+----------+------------------+------------------------------+
+| 2017-03-30 | 1.0.0    | Frank Brockners  | FastDataStacks for Danube    |
+|            |          | (Cisco)          | 1.0 release                  |
++------------+----------+------------------+------------------------------+
 
 
-OPNFV Danube Release
-======================
+OPNFV Euphrates Release
+=======================
 
 
 Any NFV solution stack is only as good as its foundation: The networking
@@ -93,123 +96,35 @@ Release Data
 | **Project**                          | FastDataStacks                       |
 |                                      |                                      |
 +--------------------------------------+--------------------------------------+
-| **Repo/tag**                         | danube.1.0                           |
+| **Repo/tag**                         | fds/euphrates.1.0                    |
 |                                      |                                      |
 +--------------------------------------+--------------------------------------+
-| **Release designation**              | Danube base release                  |
+| **Release designation**              | 5.0.0                                |
 |                                      |                                      |
 +--------------------------------------+--------------------------------------+
-| **Release date**                     | March 31st 2017                      |
+| **Release date**                     | 2017-10-20                           |
 |                                      |                                      |
 +--------------------------------------+--------------------------------------+
-| **Purpose of the delivery**          | Danube base release                  |
+| **Purpose of the delivery**          | OPNFV Euphrates release              |
 |                                      |                                      |
 +--------------------------------------+--------------------------------------+
 
-+--------------------------------------+--------------------------------------+
-| **Project**                          | FastDataStacks                       |
-|                                      |                                      |
-+--------------------------------------+--------------------------------------+
-| **Repo/tag**                         | danube.2.0                           |
-|                                      |                                      |
-+--------------------------------------+--------------------------------------+
-| **Release designation**              | Danube enhancements release          |
-|                                      |                                      |
-+--------------------------------------+--------------------------------------+
-| **Release date**                     | May 4st    2017                      |
-|                                      |                                      |
-+--------------------------------------+--------------------------------------+
-| **Purpose of the delivery**          | Danube enhancements release          |
-|                                      |                                      |
-+--------------------------------------+--------------------------------------+
-
-+--------------------------------------+--------------------------------------+
-| **Project**                          | FastDataStacks                       |
-|                                      |                                      |
-+--------------------------------------+--------------------------------------+
-| **Repo/tag**                         | danube.3.0                           |
-|                                      |                                      |
-+--------------------------------------+--------------------------------------+
-| **Release designation**              | Danube enhancements release          |
-|                                      |                                      |
-+--------------------------------------+--------------------------------------+
-| **Release date**                     | Jul 14th    2017                     |
-|                                      |                                      |
-+--------------------------------------+--------------------------------------+
-| **Purpose of the delivery**          | Danube enhancements release          |
-|                                      |                                      |
-+--------------------------------------+--------------------------------------+
-
-FastDataStacks Scenarios in Danube 1.0
-======================================
-
-In release Danube 1.0, FastDataStacks releases the following scenarios:
-
- * `os-nosdn-fdio-noha <http://docs.opnfv.org/en/stable-danube/submodules/fds/docs/scenarios/os-nosdn-fdio-noha/index.html>`_:
-  OpenStack (with Neutron networking-vpp mechanism driver), VPP
- * `os-odl_l2-fdio-ha <http://docs.opnfv.org/en/stable-danube/submodules/fds/docs/scenarios/os-odl_l2-fdio-ha/index.html>`_:
-  OpenStack (in a high-availability setup),
-  OpenDaylight (for Layer 2 networking control),
-  HoneyComb, VPP
- * `os-odl_l2-fdio-noha <http://docs.opnfv.org/en/stable-danube/submodules/fds/docs/scenarios/os-odl_l2-fdio-noha/index.html>`_:
-  OpenStack, OpenDaylight (for Layer 2 networking control),
-  HoneyComb, VPP
- * `os-odl_l3-fdio-noha <http://docs.opnfv.org/en/stable-danube/submodules/fds/docs/scenarios/os-odl_l3-fdio-noha/index.html>`_:
-  OpenStack, OpenDaylight (for Layer 2 and Layer 3 networking control),
-  HoneyComb, VPP
-
-All of the scenarios are installed using the APEX installer.
-
-
-FastDataStacks Scenarios in Danube 2.0
-======================================
-
-In release Danube 2.0, FastDataStacks releases the following scenarios:
-
- * `os-nosdn-fdio-noha <http://docs.opnfv.org/en/stable-danube/submodules/fds/docs/scenarios/os-nosdn-fdio-noha/index.html>`_:
-  OpenStack (with Neutron networking-vpp mechanism driver), VPP
- * `os-odl_l2-fdio-ha <http://docs.opnfv.org/en/stable-danube/submodules/fds/docs/scenarios/os-odl_l2-fdio-ha/index.html>`_:
-  OpenStack (in a high-availability setup),
-  OpenDaylight (for Layer 2 networking control),
-  HoneyComb, VPP
- * `os-odl_l2-fdio-noha <http://docs.opnfv.org/en/stable-danube/submodules/fds/docs/scenarios/os-odl_l2-fdio-noha/index.html>`_:
-  OpenStack, OpenDaylight (for Layer 2 networking control),
-  HoneyComb, VPP
- * `os-odl_l3-fdio-noha <http://docs.opnfv.org/en/stable-danube/submodules/fds/docs/scenarios/os-odl_l3-fdio-noha/index.html>`_:
-  OpenStack, OpenDaylight (for Layer 2 and Layer 3 networking control),
-  HoneyComb, VPP
- * `os-odl_l3-fdio-ha <http://docs.opnfv.org/en/stable-danube/submodules/fds/docs/scenarios/os-odl_l3-fdio-ha/index.html>`_:
-  OpenStack (in a high-availability setup), OpenDaylight (for Layer 2 and Layer 3 networking control in clustered mode),
-  HoneyComb, VPP
-
-
-All of the scenarios are installed using the APEX installer.
-
-
-FastDataStacks Scenarios in Danube 3.0
+FastDataStacks Scenarios in Euphrates
 ======================================
 
-In release Danube 3.0, FastDataStacks releases the following scenarios:
+In release Euphrates, FastDataStacks releases the following scenarios:
 
- * `os-nosdn-fdio-noha <http://docs.opnfv.org/en/stable-danube/submodules/fds/docs/scenarios/os-nosdn-fdio-noha/index.html>`_:
+ * `os-nosdn-fdio-noha <http://docs.opnfv.org/en/stable-euphrates/submodules/fds/docs/scenarios/os-nosdn-fdio-noha/index.html>`_:
   OpenStack (with Neutron networking-vpp mechanism driver),
   VPP
- * `os-nosdn-fdio-ha <http://docs.opnfv.org/en/stable-danube/submodules/fds/docs/scenarios/os-nosdn-fdio-ha/index.html>`_:
+ * `os-nosdn-fdio-ha <http://docs.opnfv.org/en/stable-euphrates/submodules/fds/docs/scenarios/os-nosdn-fdio-ha/index.html>`_:
   OpenStack (in a high-availability setup, with Neutron networking-vpp mechanism driver),
   VPP
- * `os-odl_l2-fdio-ha <http://docs.opnfv.org/en/stable-danube/submodules/fds/docs/scenarios/os-odl_l2-fdio-ha/index.html>`_:
-  OpenStack (in a high-availability setup),
-  OpenDaylight (for Layer 2 networking control in clustered mode),
-  HoneyComb, VPP
- * `os-odl_l2-fdio-noha <http://docs.opnfv.org/en/stable-danube/submodules/fds/docs/scenarios/os-odl_l2-fdio-noha/index.html>`_:
-  OpenStack,
-  OpenDaylight (for Layer 2 networking control),
-  HoneyComb, VPP
- * `os-odl_l3-fdio-noha <http://docs.opnfv.org/en/stable-danube/submodules/fds/docs/scenarios/os-odl_l3-fdio-noha/index.html>`_:
+ * `os-odl-fdio-noha <http://docs.opnfv.org/en/stable-euphrates/submodules/fds/docs/scenarios/os-odl-fdio-noha/index.html>`_:
   OpenStack,
   OpenDaylight (for Layer 2 and Layer 3 networking control),
   HoneyComb, VPP
- * `os-odl_l3-fdio-ha <http://docs.opnfv.org/en/stable-danube/submodules/fds/docs/scenarios/os-odl_l3-fdio-ha/index.html>`_:
+ * `os-odl-fdio-ha <http://docs.opnfv.org/en/stable-euphrates/submodules/fds/docs/scenarios/os-odl-fdio-ha/index.html>`_:
   OpenStack (in a high-availability setup),
   OpenDaylight (for Layer 2 and Layer 3 networking control in clustered mode),
   HoneyComb, VPP
@@ -217,168 +132,38 @@ In release Danube 3.0, FastDataStacks releases the following scenarios:
 
 All of the scenarios are installed using the APEX installer.
 
-
 Known Issues/Restrictions
 =========================
 
-Scenario os-nosdn-fdio-noha known issues in Danube 1.0
-------------------------------------------------------
-
-* `FDS-156 <https://jira.opnfv.org/browse/FDS-156>`_:
-  os-nosdn-fdio-noha scenario:
-  Race conditions for network-vif-plugged notification
-* `FDS-160 <https://jira.opnfv.org/browse/FDS-160>`_:
-  os-nosdn-fdio-noha scenario: Vlan fix on controller
-* `FDS-269 <https://jira.opnfv.org/browse/FDS-269>`_:
-  os-nosdn-fdio-noha scenario/refstack_devcore failure
-  - tempest.api.volume.test_volumes_actions.
-  VolumesV2ActionsTest.test_get_volume_attachment testcase
-* `FDS-270 <https://jira.opnfv.org/browse/FDS-270>`_:
-  os-nosdn-fdio-noha scenario/refstack_devcore failure -
-  tearDownClass (tempest.api.volume.test_volumes_actions.
-  VolumesV2ActionsTest)
-* `FDS-271 <https://jira.opnfv.org/browse/FDS-271>`_:
-  os-nosdn-fdio-noha scenario/snaps_smoke fails 1 test -
-  VM not able to obtain IP from DHCP
-* `FDS-272 <https://jira.opnfv.org/browse/FDS-272>`_:
-  os-nosdn-fdio-noha scenario/domino fails because
-  of https proxy issue
-
-
-Scenario os-odl_l2-fdio-noha known issues in Danube 1.0
--------------------------------------------------------
-
-* `FDS-264 <https://jira.opnfv.org/browse/FDS-264>`_:
-  ODL sometimes creates vxlan on incorrect host
-* `FDS-275 <https://jira.opnfv.org/browse/FDS-275>`_:
-  Refstack testcase ImagesOneServerTestJSON.
-  test_create_delete_image failure
-
-Scenario os-odl_l2-fdio-ha known issues in Danube 1.0
+Scenario os-nosdn-fdio-noha known issues in Euphrates
 -----------------------------------------------------
 
-* `FDS-264 <https://jira.opnfv.org/browse/FDS-264>`_:
-  ODL sometimes creates vxlan on incorrect host
-* `FDS-275 <https://jira.opnfv.org/browse/FDS-275>`_:
-  Refstack testcase ImagesOneServerTestJSON.
-  test_create_delete_image failure
-
-Scenario os-odl_l3-fdio-noha known issues in Danube 1,0
--------------------------------------------------------
-
-Note that a set of manual configration steps need to be performed
-post an automated deployment for the scenario to be fully functional.
-Please refer to `APEX-420 <https://jira.opnfv.org/browse/APEX-420>`_
-for details.
-
-* `FDS-246 <https://jira.opnfv.org/browse/FDS-246>`_:
-  Metadata service not reachable via dhcp namespace
-* `FDS-251 <https://jira.opnfv.org/browse/FDS-251>`_:
-  Nat outbound interface is not set correctly in all cases
-* `FDS-252 <https://jira.opnfv.org/browse/FDS-252>`_:
-  VPP renderer config is sometimes resolved after
-  hundreds of configuration changes
-* `FDS-264 <https://jira.opnfv.org/browse/FDS-264>`_:
-  ODL sometimes creates vxlan on incorrect host
-* `FDS-275 <https://jira.opnfv.org/browse/FDS-275>`_:
-  Refstack testcase ImagesOneServerTestJSON.
-  test_create_delete_image failure
-* `APEX-420 <https://jira.opnfv.org/browse/APEX-420>`_:
-  Public and tenant interface configuration in odl for
-  fdio_l3 noha scenario
-
-Scenario os-nosdn-fdio-noha known issues in Danube 2.0
-------------------------------------------------------
-
 * `FDS-156 <https://jira.opnfv.org/browse/FDS-156>`_:
-  os-nosdn-fdio-noha scenario:
   Race conditions for network-vif-plugged notification
 * `FDS-160 <https://jira.opnfv.org/browse/FDS-160>`_:
-  os-nosdn-fdio-noha scenario: Vlan fix on controller
-* `FDS-272 <https://jira.opnfv.org/browse/FDS-272>`_:
-  os-nosdn-fdio-noha scenario/domino fails because
-  of https proxy issue
-
-
-Scenario os-odl_l2-fdio-noha known issues in Danube 2.0
--------------------------------------------------------
-
-* `FDS-324 <https://jira.opnfv.org/browse/FDS-324>`_:
-  Clone of APEX-449 - Domino fails in ci
-* `FDS-325 <https://jira.opnfv.org/browse/FDS-325>`_:
-  4 Refstack testcases fail - qrouter tap port issue
-
-Scenario os-odl_l2-fdio-ha known issues in Danube 2.0
------------------------------------------------------
-
-* `FDS-324 <https://jira.opnfv.org/browse/FDS-324>`_:
-  Clone of APEX-449 - Domino fails in ci
-* `FDS-325 <https://jira.opnfv.org/browse/FDS-325>`_:
-  4 Refstack testcases fail - qrouter tap port issue
-
-Scenario os-odl_l3-fdio-noha known issues in Danube 2.0
--------------------------------------------------------
-
-Note that a set of manual configration steps need to be performed
-post an automated deployment for the scenario to be fully functional.
-Please refer to `APEX-420 <https://jira.opnfv.org/browse/APEX-420>`_
-and `APEX 445 <https://jira.opnfv.org/browse/APEX-445>`_ for details.
-
-* `FDS-324 <https://jira.opnfv.org/browse/FDS-324>`_:
-  Clone of APEX-449 - Domino fails in ci
-* `FDS-325 <https://jira.opnfv.org/browse/FDS-325>`_:
-  4 Refstack testcases fail - qrouter tap port issue
-* `FDS-333 <https://jira.opnfv.org/browse/FDS-333>`_:
-  Tempest failures in l3 scenarios
-* `FDS-334 <https://jira.opnfv.org/browse/FDS-334>`_:
-  Refstack failures in l3 scenarios
-
-Scenario os-odl_l3-fdio-ha known issues in Danube 2.0
------------------------------------------------------
-
-Note that a set of manual configration steps need to be performed
-post an automated deployment for the scenario to be fully functional.
-Please refer to `APEX-420 <https://jira.opnfv.org/browse/APEX-420>`_
-and `APEX 445 <https://jira.opnfv.org/browse/APEX-445>`_ for details.
-
-* `FDS-324 <https://jira.opnfv.org/browse/FDS-324>`_:
-  Clone of APEX-449 - Domino fails in ci
-* `FDS-325 <https://jira.opnfv.org/browse/FDS-325>`_:
-  4 Refstack testcases fail - qrouter tap port issue
-* `FDS-333 <https://jira.opnfv.org/browse/FDS-333>`_:
-  Tempest failures in l3 scenarios
-* `FDS-334 <https://jira.opnfv.org/browse/FDS-334>`_:
-  Refstack failures in l3 scenarios
-
-Scenario os-nosdn-fdio-noha known issues in Danube 3.0
-------------------------------------------------------
-
-* `FDS-405 <https://jira.opnfv.org/browse/FDS-405>`_:
-  vlan-strip-offload parameter needs to be set to off
+  Vlan fix on controller
 * `FDS-401 <https://jira.opnfv.org/browse/FDS-401>`_:
   SimpleHealthCheck fails in snaps_smoke
-* `FDS-156 <https://jira.opnfv.org/browse/FDS-156>`_:
-  Race conditions for network-vif-plugged notification
-* `FDS-160 <https://jira.opnfv.org/browse/FDS-160>`_:
-  Vlan fix on controller
+* `FDS-483 <https://jira.opnfv.org/browse/FDS-483>`_:
+  Live migration not supported
 
-Scenario os-nosdn-fdio-ha known issues in Danube 3.0
-------------------------------------------------------
+Scenario os-nosdn-fdio-ha known issues in Euphrates
+---------------------------------------------------
 
-* `FDS-405 <https://jira.opnfv.org/browse/FDS-405>`_:
-  vlan-strip-offload parameter needs to be set to off
-* `FDS-401 <https://jira.opnfv.org/browse/FDS-401>`_:
-  SimpleHealthCheck fails in snaps_smoke
 * `FDS-156 <https://jira.opnfv.org/browse/FDS-156>`_:
   Race conditions for network-vif-plugged notification
 * `FDS-160 <https://jira.opnfv.org/browse/FDS-160>`_:
   Vlan fix on controller
-* `FDS-400 <https://jira.opnfv.org/browse/FDS-400>`_:
-  RACE condition between VPP ML2 agent and tempest code
-* `FDS-399 <https://jira.opnfv.org/browse/FDS-399>`_:
-  Neutron ports are not marked ACTIVE
 * `FDS-371 <https://jira.opnfv.org/browse/FDS-371>`_:
   Tempest_full_parallel failures due to DBDeadlock error
+* `FDS-399 <https://jira.opnfv.org/browse/FDS-399>`_:
+  Neutron ports are not marked ACTIVE
+* `FDS-400 <https://jira.opnfv.org/browse/FDS-400>`_:
+  Race condition between VPP ML2 agent and tempest code
+* `FDS-401 <https://jira.opnfv.org/browse/FDS-401>`_:
+  SimpleHealthCheck fails in snaps_smoke
+* `FDS-483 <https://jira.opnfv.org/browse/FDS-483>`_:
+  Live migration not supported
 * `APEX-468 <https://jira.opnfv.org/browse/APEX-468>`_:
   Mariadb/mysqld fails to start post a reboot
 * `APEX-469 <https://jira.opnfv.org/browse/APEX-469>`_:
@@ -388,31 +173,39 @@ Scenario os-nosdn-fdio-ha known issues in Danube 3.0
 * `ORCEHSTRA-13 <https://jira.opnfv.org/browse/ORCEHSTRA-13>`_:
   Internal Server Error/java.lang.OutOfMemoryError: Java heap space
 
-Scenario os-odl_l2-fdio-noha known issues in Danube 3.0
--------------------------------------------------------
-
-* `FDS-397 <https://jira.opnfv.org/browse/FDS-397>`_:
-  Metadata rules are not configured
-
-Scenario os-odl_l2-fdio-ha known issues in Danube 3.0
------------------------------------------------------
-
-* `FDS-397 <https://jira.opnfv.org/browse/FDS-397>`_:
-  Metadata rules are not configured
-* `FDS-404 <https://jira.opnfv.org/browse/FDS-404>`_:
-  Cluster in HA scenarios sometimes breaks down
-
-Scenario os-odl_l3-fdio-noha known issues in Danube 3.0
--------------------------------------------------------
-
-* `FDS-397 <https://jira.opnfv.org/browse/FDS-397>`_:
-  Metadata rules are not configured
-
-Scenario os-odl_l3-fdio-ha known issues in Danube 3.0
------------------------------------------------------
-
-* `FDS-397 <https://jira.opnfv.org/browse/FDS-397>`_:
-  Metadata rules are not configured
-* `FDS-404 <https://jira.opnfv.org/browse/FDS-404>`_:
-  Cluster in HA scenarios sometimes breaks down
+Scenario os-odl-fdio-noha known issues in Euphrates
+---------------------------------------------------
+
+* `FDS-476 <https://jira.opnfv.org/browse/FDS-476>`_:
+  Race conditions in GBP
+* `FDS-481 <https://jira.opnfv.org/browse/FDS-481>`_:
+  VPP hangs on blocking read from vhost user interface
+* `FDS-482 <https://jira.opnfv.org/browse/FDS-482>`_:
+  Live migration not supported
+* `FDS-484 <https://jira.opnfv.org/browse/FDS-484>`_:
+  snaps_smoke failures
+* `APEX-468 <https://jira.opnfv.org/browse/APEX-468>`_:
+  Mariadb/mysqld fails to start post a reboot
+* `APEX-469 <https://jira.opnfv.org/browse/APEX-469>`_:
+  Undercloud iptables rules are messed up post a power outage
+* `APEX-532 <https://jira.opnfv.org/browse/APEX-532>`_:
+  Add nat undercloud configuration for fdio scenarios
+
+Scenario os-odl-fdio-ha known issues in Euphrates
+-------------------------------------------------
+
+* `FDS-476 <https://jira.opnfv.org/browse/FDS-476>`_:
+  Race conditions in GBP
+* `FDS-481 <https://jira.opnfv.org/browse/FDS-481>`_:
+  VPP hangs on blocking read from vhost user interface
+* `FDS-482 <https://jira.opnfv.org/browse/FDS-482>`_:
+  Live migration not supported
+* `FDS-484 <https://jira.opnfv.org/browse/FDS-484>`_:
+  snaps_smoke failures
+* `APEX-468 <https://jira.opnfv.org/browse/APEX-468>`_:
+  Mariadb/mysqld fails to start post a reboot
+* `APEX-469 <https://jira.opnfv.org/browse/APEX-469>`_:
+  Undercloud iptables rules are messed up post a power outage
+* `APEX-532 <https://jira.opnfv.org/browse/APEX-532>`_:
+  Add nat undercloud configuration for fdio scenarios
 
diff --git a/docs/scenarios/os-nosdn-fdio-ha/scenario.description.rst b/docs/scenarios/os-nosdn-fdio-ha/scenario.description.rst
index 86eadb2..ee4196e 100644..100755
--- a/docs/scenarios/os-nosdn-fdio-ha/scenario.description.rst
+++ b/docs/scenarios/os-nosdn-fdio-ha/scenario.description.rst
@@ -15,7 +15,8 @@ are:
  - APEX (TripleO) installer (please also see APEX installer documentation)
  - Openstack (in HA configuration)
  - FD.io/VPP virtual forwarder for tenant networking
- - etcd, which is the VPP ML2 mechanism driver's distributed key-value store, in clustered mode
+ - networking-vpp (Neutron ML2 mechanism driver for FD.io/VPP)
+ - etcd (networking-vpp's distributed key-value store) in clustered mode
 
 Introduction
 ============
@@ -25,7 +26,7 @@ require a "fast data stack" solution that provides both carrier grade
 forwarding performance, scalability and open extensibility.
 
 A key component of any NFV solution is the virtual forwarder, which needs to be
-a feature rich, high performance, highly scale virtual switch-router. It needs
+a feature rich, high performance, highly scalable virtual switch-router. It needs
 to leverage hardware accelerators when available and run in user space.  In
 addition, it should be modular and easily extensible. The Vector Packet
 Processor (VPP) supplied by the FD.io project meets these needs, in that
@@ -43,24 +44,26 @@ servers:
   * 3 Controlhosts, which run the Overcloud and Openstack services as well as the VPP ML2 etcd cluster
   * 2 or more Computehosts
 
-.. image:: FDS-nosdn-overview.png
 
 Tenant networking leverages FD.io/VPP. Open VSwitch (OVS) is used for all other
 connectivity, in particular the connectivity to public networking / the
 Internet (i.e. br-ext) is performed via OVS as in any standard OpenStack
-deployment. A VPP management agent is used to setup and manage layer 2
-networking for the scenario. Neutron ML2 plugin is configured to use
-the VPP ML2 networking mechanism driver. Tenant networking can either leverage
-VLANs or plain interfaces (flat networks). Layer 3 connectivity for a tenant
-network is provided centrally via qrouter on the control node. As in a
-standard OpenStack deployment, the Layer3 agent configures the qrouter and
-associated rulesets for security (security groups) and NAT (floating IPs).
-Public IP network connectivity for a tenant network is provided by
-interconnecting the VPP-based bridge domain representing the tenant network to
-qrouter using a tap interface.
+deployment. Neutron ML2 plugin is configured to use networking-vpp, the ML2-VPP
+networking mechanism driver. Networking-vpp also provides the VPP management
+agent used to setup and manage layer 2 networking for the scenario. Tenant
+networking can either leverage VLANs or plain interfaces. Layer 3 connectivity
+for a tenant network is provided centrally via qrouter on the control node. As
+in a standard OpenStack deployment, the Layer3 agent configures the qrouter and
+associated rulesets for security (security groups) and NAT (floating IPs). Public
+IP network connectivity for a tenant network is provided by interconnecting the
+VPP-based bridge domain representing the tenant network to qrouter using a tap
+interface.
 
 The setup is depicted below:
 
+
+.. image:: FDS-nosdn-overview.png
+
 Features of the scenario
 ------------------------
 
@@ -86,7 +89,7 @@ The os-nosdn-fdio-ha scenario combines components from two key open
 source projects: OpenStack and Fast Data (FD.io).  In order to make Fast Data
 (FD.io) networking available to this scenario, an ML2 mechanism driver and a
 light-weight control plane agent for VPP forwarder has been created. For
-details see also https://git.openstack.org/cgit/openstack/networking-vpp/
+details see also https://github.com/openstack/networking-vpp.
 
 Networking-vpp provides a Neutron ML2 mechanism driver to bring the advantages
 of VPP to OpenStack deployments.It uses an etcd cluster on the control node to
@@ -110,33 +113,7 @@ Scenario Configuration
 To enable the "os-nosdn-fdio-ha" scenario check the appropriate settings
 in the APEX configuration files. Those are typically found in /etc/opnfv-apex.
 
-Use the file "os-nosdn-fdio-ha.yaml"::
-
-  global_params:
-    ha_enabled: true
-
-  deploy_options:
-    sdn_controller: false
-    sdn_l3: false
-    tacker: true
-    congress: true
-    sfc: false
-    vpn: false
-    vpp: true
-    dataplane: fdio
-    performance:
-      Controller:
-        vpp:
-          uio-driver: uio_pci_generic
-      Compute:
-        kernel:
-          hugepagesz: 2M
-          hugepages: 2048
-          intel_iommu: 'on'
-          iommu: pt
-          isolcpus: 1,2
-        vpp:
-          uio-driver: uio_pci_generic
+Use the file "os-nosdn-fdio-ha.yaml".
 
 
 Validated deployment environments
@@ -166,8 +143,7 @@ References
   * FastDataStacks OPNFV project wiki: https://wiki.opnfv.org/display/fds
   * Fast Data (FD.io): https://fd.io/
   * FD.io Vector Packet Processor (VPP): https://wiki.fd.io/view/VPP
-  * ML2 VPP mechanisms driver: https://git.openstack.org/cgit/openstack/networking-vpp/
-  * OPNFV Danube release - more information: http://www.opnfv.org/danube
+  * ML2 VPP mechanism driver: https://github.com/openstack/networking-vpp
   * Networking-vpp launchpad (ticket tracker) https://launchpad.net/networking-vpp
   * Networking-vpp Wiki: https://wiki.openstack.org/wiki/Networking-vpp/
   * APEX (TripleO based) installer: https://wiki.opnfv.org/display/apex/Apex
diff --git a/docs/scenarios/os-nosdn-fdio-noha/index.rst b/docs/scenarios/os-nosdn-fdio-noha/index.rst
index daf71e3..8c21268 100644
--- a/docs/scenarios/os-nosdn-fdio-noha/index.rst
+++ b/docs/scenarios/os-nosdn-fdio-noha/index.rst
@@ -9,7 +9,7 @@
 Fast Data Stacks Scenario: os-nosdn-fdio-noha Overview and Description
 **********************************************************************
 
-Scenario: "OpenStack - FD.io" (apex-os-nosdn-fdio-noha)
+Scenario: "OpenStack - FD.io" (os-nosdn-fdio-noha)
 is a scenario developed as part of the FastDataStacks
 OPNFV project.
 
diff --git a/docs/scenarios/os-nosdn-fdio-noha/scenario.description.rst b/docs/scenarios/os-nosdn-fdio-noha/scenario.description.rst
index 059c614..aeecbb8 100755
--- a/docs/scenarios/os-nosdn-fdio-noha/scenario.description.rst
+++ b/docs/scenarios/os-nosdn-fdio-noha/scenario.description.rst
@@ -6,15 +6,16 @@
 Scenario: "OpenStack - FD.io"
 =============================
 
-Scenario: apex-os-nosdn-fdio-noha
+Scenario: os-nosdn-fdio-noha
 
 "apex-os-nosdn-noha" is a scenario developed as part of the FastDataStacks
-OPNFV project. The main components of the "apex-os-nosdn-fdio-noha" scenario
+OPNFV project. The main components of the "os-nosdn-fdio-noha" scenario
 are:
 
  - APEX (TripleO) installer (please also see APEX installer documentation)
  - Openstack (in non-HA configuration)
  - FD.io/VPP virtual forwarder for tenant networking
+ - networking-vpp (Neutron ML2 mechanism driver for FD.io/VPP)
 
 Introduction
 ============
@@ -24,7 +25,7 @@ require a "fast data stack" solution that provides both carrier grade
 forwarding performance, scalability and open extensibility.
 
 A key component of any NFV solution is the virtual forwarder, which needs to be
-a feature rich, high performance, highly scale virtual switch-router. It needs
+a feature rich, high performance, highly scalable virtual switch-router. It needs
 to leverage hardware accelerators when available and run in user space.  In
 addition, it should be modular and easily extensible. The Vector Packet
 Processor (VPP) supplied by the FD.io project meets these needs, in that
@@ -35,33 +36,36 @@ The "Openstack - FD.io/VPP" scenario provides the capability to realize a set
 of use-cases relevant to the deployment of NFV nodes instantiated by means of
 an Openstack orchestration system on FD.io/VPP enabled compute nodes.
 
-A deployment of the "apex-os-nosdn-fdio-noha" scenario consists of 3 or more
+A deployment of the "os-nosdn-fdio-noha" scenario consists of 3 or more
 servers:
 
   * 1 Jumphost hosting the APEX installer - running the Undercloud
   * 1 Controlhost, which runs the Overcloud and Openstack services
   * 1 or more Computehosts
 
-.. image:: FDS-nosdn-overview.png
 
 Tenant networking leverages FD.io/VPP. Open VSwitch (OVS) is used for all other
 connectivity, in particular the connectivity to public networking / the
 Internet (i.e. br-ext) is performed via OVS as in any standard OpenStack
-deployment. A VPP management agent is used to setup and manage layer 2
-networking for the scenario. Neutron ML2 plugin is configured to use
-the ML2-VPP networking mechanism driver. Tenant networking can either leverage
-VLANs or plain interfaces. Layer 3 connectivity for a tenant network is
-provided centrally via qrouter on the control node. As in a standard OpenStack
-deployment, the Layer3 agent configures the qrouter and associated rulesets for
-security (security groups) and NAT (floating IPs). Public IP network
-connectivity for a tenant network is provided by interconnecting the VPP-based
-bridge domain representing the tenant network to qrouter using a tap interface.
+deployment. Neutron ML2 plugin is configured to use networking-vpp, the ML2-VPP
+networking mechanism driver. Networking-vpp also provides the VPP management
+agent used to setup and manage layer 2 networking for the scenario. Tenant
+networking can either leverage VLANs or plain interfaces. Layer 3 connectivity
+for a tenant network is provided centrally via qrouter on the control node. As
+in a standard OpenStack deployment, the Layer3 agent configures the qrouter and
+associated rulesets for security (security groups) and NAT (floating IPs). Public
+IP network connectivity for a tenant network is provided by interconnecting the
+VPP-based bridge domain representing the tenant network to qrouter using a tap
+interface.
+
 The setup is depicted below:
 
+.. image:: FDS-nosdn-overview.png
+
 Features of the scenario
 ------------------------
 
-Main features of the "apex-os-odl_l2-fdio-noha" scenario:
+Main features of the "os-nosdn-fdio-noha" scenario:
 
   * Automated installation using the APEX installer
   * Fast and scalable tenant networking using FD.io/VPP as forwarder
@@ -77,11 +81,11 @@ Main features of the "apex-os-odl_l2-fdio-noha" scenario:
 Networking in this scenario using VPP
 -------------------------------------
 
-The apex-os-nosdn-fdio-noha scenario combines components from two key open
+The os-nosdn-fdio-noha scenario combines components from two key open
 source projects: OpenStack and Fast Data (FD.io).  In order to make Fast Data
 (FD.io) networking available to this scenario, an ML2 mechanism driver and a
 light-weight control plane agent for VPP forwarder has been created. For
-details see also https://github.com/naveenjoy/networking-vpp/
+details see also https://github.com/openstack/networking-vpp.
 
 Networking-vpp provides a Neutron ML2 mechanism driver to bring the advantages
 of VPP to OpenStack deployments.It uses an etcd cluster on the control node to
@@ -102,28 +106,15 @@ faces when you read it.
 Scenario Configuration
 ======================
 
-To enable the "apex-os-nosdn-fdio-noha" scenario check the appropriate settings
+To enable the "os-nosdn-fdio-noha" scenario check the appropriate settings
 in the APEX configuration files. Those are typically found in /etc/opnfv-apex.
 
-File "deploy_settings.yaml" choose opendaylight as controller with version
-"boron" and enable vpp as forwarder::
-
-  global_params:
-    ha_enabled: false
-
-  deploy_options:
-    sdn_controller: false
-    sdn_l3: false
-    tacker: false
-    congress: false
-    sfc: false
-    vpn: false
-    vpp: true
+Use the file "os-nosdn-fdio-noha.yaml".
 
 Validated deployment environments
 =================================
 
-The "os-odl_l2-fdio-noha" scenario has been deployed and tested
+The "os-nosdn-fdio-noha" scenario has been deployed and tested
 on the following sets of hardware:
  * Linux Foundation lab (Chassis: Cisco UCS-B-5108 blade server,
    NICs: 8 external / 32 internal 10GE ports,
@@ -137,7 +128,8 @@ on the following sets of hardware:
 Limitations, Issues and Workarounds
 ===================================
 
-There are no known issues.
+For specific information on limitations and issues, please refer to the APEX
+installer release notes.
 
 References
 ==========
@@ -146,5 +138,7 @@ References
   * FastDataStacks OPNFV project wiki: https://wiki.opnfv.org/display/fds
   * Fast Data (FD.io): https://fd.io/
   * FD.io Vector Packet Processor (VPP): https://wiki.fd.io/view/VPP
-  * ML2 VPP mechanisms driver: https://github.com/naveenjoy/networking-vpp/
-  * OPNFV Colorado release - more information: http://www.opnfv.org/colorado
+  * ML2 VPP mechanism driver: https://github.com/openstack/networking-vpp
+  * Networking-vpp launchpad (ticket tracker) https://launchpad.net/networking-vpp
+  * Networking-vpp Wiki: https://wiki.openstack.org/wiki/Networking-vpp/
+  * APEX (TripleO based) installer: https://wiki.opnfv.org/display/apex/Apex