summaryrefslogtreecommitdiffstats
path: root/docs/guides/onap-developer/settingup/onap_heat.rst
diff options
context:
space:
mode:
authorRich Bennett <rb2745@att.com>2018-09-01 09:48:13 -0400
committerRich Bennett <rb2745@att.com>2018-09-01 09:54:19 -0400
commit52b5c09262b614e10bc223dd1811f81760a3337e (patch)
tree2873aa58ac84715ba8187b7e27e7829044871d3e /docs/guides/onap-developer/settingup/onap_heat.rst
parent40e2182b5f8ce2952abb176bd539bf32ce164464 (diff)
Cherry pick beijing improvements to master
Replicating changes made when finalizing Beijing branch in the doc master branch. Change-Id: Ib1da658aef8cb84f896c6abac23631579ec0b80c Issue-ID: DOC-280 Signed-off-by: Rich Bennett <rb2745@att.com>
Diffstat (limited to 'docs/guides/onap-developer/settingup/onap_heat.rst')
-rw-r--r--docs/guides/onap-developer/settingup/onap_heat.rst22
1 files changed, 13 insertions, 9 deletions
diff --git a/docs/guides/onap-developer/settingup/onap_heat.rst b/docs/guides/onap-developer/settingup/onap_heat.rst
index afbbd6bf8..f3b545a88 100644
--- a/docs/guides/onap-developer/settingup/onap_heat.rst
+++ b/docs/guides/onap-developer/settingup/onap_heat.rst
@@ -10,18 +10,17 @@
.. index:: Setting Up Full ONAP using Virtual Machines
+==============================
+**Setting Up ONAP using Heat**
+==============================
-===============================================
-**Setting Up Full ONAP using Virtual Machines**
-===============================================
-
-.. _demo-installing-running-onap:
+.. _installing-onap-heat:
**Context**
===========
ONAP may be deployed in different contexts depending on your requirements.
The recommended installation for Beijng Release over virtual machines is based
-on OpenStack HEAT Template.
+on OpenStack Heat Template.
The VNFs managed by ONAP may be deployed in different OpenStack tenants or
based on top of VMware based infrastructure. For details, refer
@@ -30,6 +29,11 @@ based on top of VMware based infrastructure. For details, refer
The current installation is based on the single tenant deployment (all the ONAP
components will be hosted in a unique tenant).
+.. note::
+ Prior to deployment of ONAP, there is no need to download manually any Docker Container.
+ The Heat deployment takes care to automatically download the Docker Containers.
+
+
.. _demo-installing-running-onap-requirements:
**Requirements**
@@ -148,9 +152,9 @@ Both following files must be downloaded and configured to match your
configuration:
- Template file:
- https://git.onap.org/demo/plain/heat/ONAP/onap_openstack.yaml
+ https://git.onap.org/demo/plain/heat/ONAP/onap_openstack.yaml?h=beijing
- Environment file:
- https://git.onap.org/demo/plain/heat/ONAP/onap_openstack.env
+ https://git.onap.org/demo/plain/heat/ONAP/onap_openstack.env?h=beijing
The environment file must be customized as described in the following sections.
@@ -408,7 +412,7 @@ command:
========================
The current ONAP installation is using the *onap.org* domain.
To use the portal on your desktop, you must configure the following information
-in your *host* file (located in /etc/hosts for Linux or
+in your *hosts* file (located in /etc/hosts for Linux or
/windows/system32/drivers/etc/hosts for Windows):
.. code-block:: bash