summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Irnich <tim.irnich@ericsson.com>2016-08-22 20:12:52 +0200
committerTim Irnich <tim.irnich@ericsson.com>2016-08-23 12:04:34 +0000
commit7daf49f7a2995626015500dc8e8df6242e29d971 (patch)
tree28e651420c4c1eef4be8b8a333297e9328965994
parent64f27d32b6ae7321145b01524b8a2c86c88137e9 (diff)
Small final improvements in userguide.
Change-Id: I065d96cf9692155c336476ec3ad4f4bc92287740 Signed-off-by: Tim Irnich <tim.irnich@ericsson.com> (cherry picked from commit fd6f067dc5fd3e4a90f2abe92a5df1172c543cf9)
-rw-r--r--docs/userguide/feature.userguide.rst12
1 files changed, 9 insertions, 3 deletions
diff --git a/docs/userguide/feature.userguide.rst b/docs/userguide/feature.userguide.rst
index 0e6a6ba..6b5f4dd 100644
--- a/docs/userguide/feature.userguide.rst
+++ b/docs/userguide/feature.userguide.rst
@@ -158,9 +158,14 @@ and make changes as required.
Installation procedures
-----------------------
-We describe several alternative procedures in the following.
+We describe several alternative procedures in the following.
+First, we describe several methods that are based on the deploy.sh script, which is also used by the OPNFV CI system.
+It can be found in the Fuel repository.
-Go to
+In addition, the SDNVPN feature can also be configured manually in the Fuel GUI.
+This is described in the last subsection.
+
+Before starting any of the following procedures, go to
::
cd <opnfv-fuel-repo>/ci
@@ -178,7 +183,8 @@ node discovery and platform deployment) will take place without any further prom
Full automatic virtual deployment NO High Availability Mode
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-The following command will deploy the SDNVPN scenario in its non-high-availability flavor. Otherwise it does the same as described above.
+The following command will deploy the SDNVPN scenario in its non-high-availability flavor (note the
+different scenario name for the -s switch). Otherwise it does the same as described above.
::
sudo bash ./deploy.sh -b file://<path-to-opnfv-fuel-repo>/config/ -l devel-pipeline -p <your-lab-name> -s os-odl_l2-bgpvpn-noha -i file://<path-to-fuel-iso>