summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBin Hu <bh526r@att.com>2016-02-22 09:49:32 -0800
committerBin Hu <bh526r@att.com>2016-02-22 17:54:19 +0000
commitc57503d99d032e65a44cb0c0f3cd050227f6fea9 (patch)
tree405f14f6d3f7800f373219560312a36e97a50833
parent684e37f88d6640be3d553a55aa47548da07be30d (diff)
JIRA:IPVSIX-29 sync with Apex and Joid for update of directory structure
Change-Id: Ia114a99b8746c672758d23642897026fbc3962ce Signed-off-by: Bin Hu <bh526r@att.com> (cherry picked from commit 6d00dfa753490345a3c97a3f77793005cd90f89b)
-rw-r--r--docs/configguide/featureconfig.rst12
-rw-r--r--docs/reldoc/index.rst12
2 files changed, 12 insertions, 12 deletions
diff --git a/docs/configguide/featureconfig.rst b/docs/configguide/featureconfig.rst
index ad4c5e6..a1fc91b 100644
--- a/docs/configguide/featureconfig.rst
+++ b/docs/configguide/featureconfig.rst
@@ -56,7 +56,7 @@ Install OPNFV and Preparation
.. code-block:: bash
# HA deployment in OpenStack-only environment
- ./opnfv-deploy -d /etc/opnfv/os-nosdn-nofeature-ha.yaml
+ ./opnfv-deploy -d /etc/opnfv-apex/os-nosdn-nofeature-ha.yaml
# Non-HA deployment in OpenStack-only environment
# Non-HA deployment is currently not supported by Apex installer.
@@ -91,10 +91,10 @@ Install OPNFV and Preparation
.. code-block:: bash
# HA deployment in OpenStack-only environment
- ./deploy.sh -o liberty -s nosdn -t ha
+ ./deploy.sh -o liberty -s nosdn -t ha -l default -f ipv6
# Non-HA deployment in OpenStack-only environment
- ./deploy.sh -o liberty -s nosdn -t nonha
+ ./deploy.sh -o liberty -s nosdn -t nonha -l default -f ipv6
Please **NOTE** that you need to refer to installer's documentation for other necessary
parameters applicable to your deployment.
@@ -410,7 +410,7 @@ of OPNFV Brahmaputra Release:
.. code-block:: bash
# HA deployment in OpenStack with Open Daylight L2-only environment
- ./opnfv-deploy -d /etc/opnfv/os-odl_l2-nofeature-ha.yaml
+ ./opnfv-deploy -d /etc/opnfv-apex/os-odl_l2-nofeature-ha.yaml
# Non-HA deployment in OpenStack with Open Daylight L2-only environment
# Non-HA deployment is currently not supported by Apex installer.
@@ -445,10 +445,10 @@ of OPNFV Brahmaputra Release:
.. code-block:: bash
# HA deployment in OpenStack with Open Daylight L2-only environment
- ./deploy.sh -o liberty -s odl -t ha
+ ./deploy.sh -o liberty -s odl -t ha -l default -f ipv6
# Non-HA deployment in OpenStack with Open Daylight L2-only environment
- ./deploy.sh -o liberty -s odl -t nonha
+ ./deploy.sh -o liberty -s odl -t nonha -l default -f ipv6
Please **NOTE** that you need to refer to installer's documentation for other necessary
parameters applicable to your deployment.
diff --git a/docs/reldoc/index.rst b/docs/reldoc/index.rst
index 18fadea..e8455a5 100644
--- a/docs/reldoc/index.rst
+++ b/docs/reldoc/index.rst
@@ -56,7 +56,7 @@ Install OPNFV and Preparation
.. code-block:: bash
# HA deployment in OpenStack-only environment
- ./opnfv-deploy -d /etc/opnfv/os-nosdn-nofeature-ha.yaml
+ ./opnfv-deploy -d /etc/opnfv-apex/os-nosdn-nofeature-ha.yaml
# Non-HA deployment in OpenStack-only environment
# Non-HA deployment is currently not supported by Apex installer.
@@ -91,10 +91,10 @@ Install OPNFV and Preparation
.. code-block:: bash
# HA deployment in OpenStack-only environment
- ./deploy.sh -o liberty -s nosdn -t ha
+ ./deploy.sh -o liberty -s nosdn -t ha -l default -f ipv6
# Non-HA deployment in OpenStack-only environment
- ./deploy.sh -o liberty -s nosdn -t nonha
+ ./deploy.sh -o liberty -s nosdn -t nonha -l default -f ipv6
Please **NOTE** that you need to refer to installer's documentation for other necessary
parameters applicable to your deployment.
@@ -410,7 +410,7 @@ of OPNFV Brahmaputra Release:
.. code-block:: bash
# HA deployment in OpenStack with Open Daylight L2-only environment
- ./opnfv-deploy -d /etc/opnfv/os-odl_l2-nofeature-ha.yaml
+ ./opnfv-deploy -d /etc/opnfv-apex/os-odl_l2-nofeature-ha.yaml
# Non-HA deployment in OpenStack with Open Daylight L2-only environment
# Non-HA deployment is currently not supported by Apex installer.
@@ -445,10 +445,10 @@ of OPNFV Brahmaputra Release:
.. code-block:: bash
# HA deployment in OpenStack with Open Daylight L2-only environment
- ./deploy.sh -o liberty -s odl -t ha
+ ./deploy.sh -o liberty -s odl -t ha -l default -f ipv6
# Non-HA deployment in OpenStack with Open Daylight L2-only environment
- ./deploy.sh -o liberty -s odl -t nonha
+ ./deploy.sh -o liberty -s odl -t nonha -l default -f ipv6
Please **NOTE** that you need to refer to installer's documentation for other necessary
parameters applicable to your deployment.