summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBin Hu <bh526r@att.com>2016-01-19 10:47:29 -0800
committerBin Hu <bh526r@att.com>2016-01-19 18:49:07 +0000
commit23a08a99a9d61cf9c516b85187ee0f9f1d7c9424 (patch)
treec26222330b37d5f751ae17b31af8e1c4e7974c51
parent646c84dca0ea0db8339ba1fe22890004ed010079 (diff)
JIRA:IPVSIX-29
Change-Id: I948b3187326537c611e8c9fe6390936fa1e6061d Signed-off-by: Bin Hu <bh526r@att.com> (cherry picked from commit 431cd04cb5959febf2f3c3e258a15df58514d0cf)
-rw-r--r--docs/configguide/featureconfig.rst34
-rw-r--r--docs/reldoc/index.rst34
2 files changed, 62 insertions, 6 deletions
diff --git a/docs/configguide/featureconfig.rst b/docs/configguide/featureconfig.rst
index 01c0262..7a16150 100644
--- a/docs/configguide/featureconfig.rst
+++ b/docs/configguide/featureconfig.rst
@@ -47,6 +47,20 @@ Install OPNFV and Preparation
**OPNFV-NATIVE-INSTALL-1**: To install OpenStack-only environment of OPNFV Brahmaputra Release:
+**Compass** Installer:
+
+.. code-block:: bash
+
+ # HA deployment in OpenStack-only environment
+ export ISO_URL=file://$BUILD_DIRECTORY/compass.iso
+ export OS_VERSION=${{COMPASS_OS_VERSION}}
+ export OPENSTACK_VERSION=${{COMPASS_OPENSTACK_VERSION}}
+ export CONFDIR=$WORKSPACE/deploy/conf/vm_environment
+ sudo ./deploy.sh --dha $CONFDIR/os-nosdn-nofeature-ha.yml --network $CONFDIR/$NODE_NAME/network.yml
+
+ # Non-HA deployment in OpenStack-only environment
+ # Non-HA deployment is currently not supported by Compass installer
+
**Fuel** Installer:
.. code-block:: bash
@@ -67,7 +81,7 @@ Install OPNFV and Preparation
# Non-HA deployment in OpenStack-only environment
sudo ./deploy.sh -o liberty -s nosdn -t noha
-Please **NOTE** that currently only ``Fuel`` and ``Joid`` installers support this environment.
+Please **NOTE** that currently only ``Compass``, ``Fuel`` and ``Joid`` installers support this environment.
**OPNFV-NATIVE-INSTALL-2**: Clone the following GitHub repository to get the
configuration and metadata files
@@ -320,7 +334,21 @@ of OPNFV Brahmaputra Release:
sudo opnfv-deploy -d /etc/opnfv/os-odl_l2-nofeature-ha.yaml
# Non-HA deployment in OpenStack with Open Daylight L2-only environment
- # Currently it is not supported by Apex installer.
+ # Non-HA deployment is currently not supported by Apex installer.
+
+**Compass** Installer:
+
+.. code-block:: bash
+
+ # HA deployment in OpenStack with Open Daylight L2-only environment
+ export ISO_URL=file://$BUILD_DIRECTORY/compass.iso
+ export OS_VERSION=${{COMPASS_OS_VERSION}}
+ export OPENSTACK_VERSION=${{COMPASS_OPENSTACK_VERSION}}
+ export CONFDIR=$WORKSPACE/deploy/conf/vm_environment
+ sudo ./deploy.sh --dha $CONFDIR/os-odl_l2-nofeature-ha.yml --network $CONFDIR/$NODE_NAME/network.yml
+
+ # Non-HA deployment in OpenStack with Open Daylight L2-only environment
+ # Non-HA deployment is currently not supported by Compass installer
**Fuel** Installer:
@@ -332,7 +360,7 @@ 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`` and ``Fuel`` installer support this environment.
+Please **NOTE** that currently only ``Apex``, ``Compass`` and ``Fuel`` installer support this environment.
**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 80acf38..ec74509 100644
--- a/docs/reldoc/index.rst
+++ b/docs/reldoc/index.rst
@@ -47,6 +47,20 @@ Install OPNFV and Preparation
**OPNFV-NATIVE-INSTALL-1**: To install OpenStack-only environment of OPNFV Brahmaputra Release:
+**Compass** Installer:
+
+.. code-block:: bash
+
+ # HA deployment in OpenStack-only environment
+ export ISO_URL=file://$BUILD_DIRECTORY/compass.iso
+ export OS_VERSION=${{COMPASS_OS_VERSION}}
+ export OPENSTACK_VERSION=${{COMPASS_OPENSTACK_VERSION}}
+ export CONFDIR=$WORKSPACE/deploy/conf/vm_environment
+ sudo ./deploy.sh --dha $CONFDIR/os-nosdn-nofeature-ha.yml --network $CONFDIR/$NODE_NAME/network.yml
+
+ # Non-HA deployment in OpenStack-only environment
+ # Non-HA deployment is currently not supported by Compass installer
+
**Fuel** Installer:
.. code-block:: bash
@@ -67,7 +81,7 @@ Install OPNFV and Preparation
# Non-HA deployment in OpenStack-only environment
sudo ./deploy.sh -o liberty -s nosdn -t noha
-Please **NOTE** that currently only ``Fuel`` and ``Joid`` installers support this environment.
+Please **NOTE** that currently only ``Compass``, ``Fuel`` and ``Joid`` installers support this environment.
**OPNFV-NATIVE-INSTALL-2**: Clone the following GitHub repository to get the
configuration and metadata files
@@ -320,7 +334,21 @@ of OPNFV Brahmaputra Release:
sudo opnfv-deploy -d /etc/opnfv/os-odl_l2-nofeature-ha.yaml
# Non-HA deployment in OpenStack with Open Daylight L2-only environment
- # Currently it is not supported by Apex installer.
+ # Non-HA deployment is currently not supported by Apex installer.
+
+**Compass** Installer:
+
+.. code-block:: bash
+
+ # HA deployment in OpenStack with Open Daylight L2-only environment
+ export ISO_URL=file://$BUILD_DIRECTORY/compass.iso
+ export OS_VERSION=${{COMPASS_OS_VERSION}}
+ export OPENSTACK_VERSION=${{COMPASS_OPENSTACK_VERSION}}
+ export CONFDIR=$WORKSPACE/deploy/conf/vm_environment
+ sudo ./deploy.sh --dha $CONFDIR/os-odl_l2-nofeature-ha.yml --network $CONFDIR/$NODE_NAME/network.yml
+
+ # Non-HA deployment in OpenStack with Open Daylight L2-only environment
+ # Non-HA deployment is currently not supported by Compass installer
**Fuel** Installer:
@@ -332,7 +360,7 @@ 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`` and ``Fuel`` installer support this environment.
+Please **NOTE** that currently only ``Apex``, ``Compass`` and ``Fuel`` installer support this environment.
**OPNFV-INSTALL-2**: Clone the following GitHub repository to get the
configuration and metadata files