summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBin Hu <bh526r@att.com>2016-01-29 14:39:45 -0800
committerBin Hu <bh526r@att.com>2016-01-29 22:41:29 +0000
commitdd0b69a4a6012c077a8cdcb04e5ec3075c8d9a60 (patch)
treea9fef4ae09e992d87ee9eb75051d738bb1b5454e
parent54950f2c1c47c0ba0d49c94a9964c3492e1f1a68 (diff)
JIRA:IPVSIX-29
Change-Id: I1c46a122d294109b0899f7ffc1c79b1ac00c2088 Signed-off-by: Bin Hu <bh526r@att.com> (cherry picked from commit 95f956c80ceb6c5e6a39839d9a6630ba40126eeb)
-rw-r--r--docs/configguide/featureconfig.rst13
-rw-r--r--docs/reldoc/index.rst13
2 files changed, 20 insertions, 6 deletions
diff --git a/docs/configguide/featureconfig.rst b/docs/configguide/featureconfig.rst
index d99eaa7..7d96508 100644
--- a/docs/configguide/featureconfig.rst
+++ b/docs/configguide/featureconfig.rst
@@ -77,10 +77,10 @@ Install OPNFV and Preparation
.. code-block:: bash
# HA deployment in OpenStack-only environment
- sudo ./deploy.sh -s os-nofeature-ha
+ sudo ./deploy.sh -s os-nosdn-nofeature-ha
# Non-HA deployment in OpenStack-only environment
- sudo ./deploy.sh -s os-nofeature-noha
+ sudo ./deploy.sh -s os-nosdn-nofeature-noha
**Joid** Installer:
@@ -92,6 +92,9 @@ Install OPNFV and Preparation
# Non-HA deployment in OpenStack-only environment
sudo ./deploy.sh -o liberty -s nosdn -t noha
+Please **NOTE** that you need to refer to installer's documentation for other necessary
+parameters applicable to your deployment.
+
**OPNFV-NATIVE-INSTALL-2**: Clone the following GitHub repository to get the
configuration and metadata files
@@ -425,7 +428,11 @@ of OPNFV Brahmaputra Release:
# Non-HA deployment in OpenStack with Open Daylight L2-only environment
sudo ./deploy.sh -s os-odl_l2-nofeature-noha
-Please **NOTE** that currently only ``Apex``, ``Compass`` and ``Fuel`` installer support this environment.
+Please **NOTE** that:
+
+* Currently only ``Apex``, ``Compass`` and ``Fuel`` installer support this environment.
+* You need to refer to installer's documentation for other necessary
+ parameters applicable to your deployment.
**OPNFV-INSTALL-2**: Clone the following GitHub repository to get the
configuration and metadata files
diff --git a/docs/reldoc/index.rst b/docs/reldoc/index.rst
index 5965d21..0169480 100644
--- a/docs/reldoc/index.rst
+++ b/docs/reldoc/index.rst
@@ -77,10 +77,10 @@ Install OPNFV and Preparation
.. code-block:: bash
# HA deployment in OpenStack-only environment
- sudo ./deploy.sh -s os-nofeature-ha
+ sudo ./deploy.sh -s os-nosdn-nofeature-ha
# Non-HA deployment in OpenStack-only environment
- sudo ./deploy.sh -s os-nofeature-noha
+ sudo ./deploy.sh -s os-nosdn-nofeature-noha
**Joid** Installer:
@@ -92,6 +92,9 @@ Install OPNFV and Preparation
# Non-HA deployment in OpenStack-only environment
sudo ./deploy.sh -o liberty -s nosdn -t noha
+Please **NOTE** that you need to refer to installer's documentation for other necessary
+parameters applicable to your deployment.
+
**OPNFV-NATIVE-INSTALL-2**: Clone the following GitHub repository to get the
configuration and metadata files
@@ -425,7 +428,11 @@ of OPNFV Brahmaputra Release:
# Non-HA deployment in OpenStack with Open Daylight L2-only environment
sudo ./deploy.sh -s os-odl_l2-nofeature-noha
-Please **NOTE** that currently only ``Apex``, ``Compass`` and ``Fuel`` installer support this environment.
+Please **NOTE** that:
+
+* Currently only ``Apex``, ``Compass`` and ``Fuel`` installer support this environment.
+* You need to refer to installer's documentation for other necessary
+ parameters applicable to your deployment.
**OPNFV-INSTALL-2**: Clone the following GitHub repository to get the
configuration and metadata files