From 86c9a248b85b1b72f7ae5f1c93aaa0c60dd777ad Mon Sep 17 00:00:00 2001 From: Bin Hu Date: Fri, 15 Jan 2016 10:08:58 -0800 Subject: JIRA:IPVSIX-29 Change-Id: Ie3a09ed4f4b95471017c7f92c2afc9b9f096154a Signed-off-by: Bin Hu (cherry picked from commit af118dfbe26b83f9fac77fd8070b55f3013e1ce7) --- docs/reldoc/index.rst | 34 ++++++++++++++-------------------- 1 file changed, 14 insertions(+), 20 deletions(-) (limited to 'docs/reldoc/index.rst') diff --git a/docs/reldoc/index.rst b/docs/reldoc/index.rst index f6dc4da..4367796 100644 --- a/docs/reldoc/index.rst +++ b/docs/reldoc/index.rst @@ -47,25 +47,17 @@ Install OPNFV and Preparation **OPNFV-NATIVE-INSTALL-1**: To install OpenStack-only environment of OPNFV Brahmaputra Release: -**Apex Installer**: - -.. code-block:: bash - - # HA deployment in OpenStack-only environment - opnfv-deploy -d /etc/opnfv/os-ha.yaml - - # Non-HA deployment in OpenStack-only environment - opnfv-deploy -d /etc/opnfv/os-noha.yaml - **Fuel** Installer: .. code-block:: bash # HA deployment in OpenStack-only environment - deploy.sh -s os-ha + sudo deploy.sh -s os-nofeature-ha # Non-HA deployment in OpenStack-only environment - deploy.sh -s os-noha + sudo deploy.sh -s os-nofeature-noha + +Please **NOTE** that currently only ``Fuel`` installer supports this environment. **OPNFV-NATIVE-INSTALL-2**: Clone the following GitHub repository to get the configuration and metadata files @@ -303,21 +295,23 @@ of OPNFV Brahmaputra Release: .. code-block:: bash - # HA deployment in OpenStack-only environment - opnfv-deploy -d /etc/opnfv/os-odl_l2-ha.yaml + # HA deployment in OpenStack with Open Daylight L2-only environment + sudo opnfv-deploy -d /etc/opnfv/os-odl_l2-nofeature-ha.yaml - # Non-HA deployment in OpenStack-only environment - opnfv-deploy -d /etc/opnfv/os-odl_l2-noha.yaml + # Non-HA deployment in OpenStack with Open Daylight L2-only environment + # Currently it is not supported by Apex installer. **Fuel** Installer: .. code-block:: bash - # HA deployment in OpenStack-only environment - deploy.sh -s os-odl_l2-ha + # HA deployment in OpenStack with Open Daylight L2-only environment + sudo deploy.sh -s os-odl_l2-nofeature-ha - # Non-HA deployment in OpenStack-only environment - deploy.sh -s os-odl_l2-noha + # 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`` and ``Fuel`` installer support this environment. **OPNFV-INSTALL-2**: Clone the following GitHub repository to get the configuration and metadata files -- cgit 1.2.3-korg