summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorRich Bennett <rb2745@att.com>2018-05-23 12:26:27 +0000
committerGerrit Code Review <gerrit@onap.org>2018-05-23 12:26:27 +0000
commitd387b93e14ad9f705e7bcfc4074942337c9b2aca (patch)
treeb11bb9c9e8662e1b884b72cbb894501545e57e33 /docs
parent755f58514869f38cb3b7f93e3e74015c646ed65d (diff)
parentb1726b5767be7889b3a30354e96bf71cfdc1e187 (diff)
Merge "Correct SettingUp ONAP"
Diffstat (limited to 'docs')
-rw-r--r--docs/guides/onap-developer/settingup/onap_heat.rst10
1 files changed, 4 insertions, 6 deletions
diff --git a/docs/guides/onap-developer/settingup/onap_heat.rst b/docs/guides/onap-developer/settingup/onap_heat.rst
index db372c589..833393d33 100644
--- a/docs/guides/onap-developer/settingup/onap_heat.rst
+++ b/docs/guides/onap-developer/settingup/onap_heat.rst
@@ -95,7 +95,7 @@ components, and provides VM information (flavor and image):
onap-sdnc SDNC, CCSDK large Ubuntu 14.04
onap-so SO large Ubuntu 16.04
onap-vid VID medium Ubuntu 14.04
- onap-dcae DCAE, Holmes small Ubuntu 14.04
+ onap-dcae DCAE, Holmes xlarge Ubuntu 16.04
onap-music Music large Ubuntu 14.04
onap-oof OOF large Ubuntu 16.04
onap-aaf AAF medium Ubuntu 16.04
@@ -118,7 +118,6 @@ Artifacts
---------
The following artifacts must be deployed on the OpenStack infrastructure:
- a public SSH key to access the various VM
- - private SSH key and public key SSH key for the DCAE VM
- Ubuntu 14.04 image (https://cloud-images.ubuntu.com/releases/14.04/14.04/)
- Ubuntu 16.04 image (https://cloud-images.ubuntu.com/releases/16.04/release/)
- Set of flavors: small, medium, large, xlarge
@@ -177,7 +176,7 @@ The resource section contains the definition of:
- ONAP Private Management Network, which ONAP components use to communicate
with each other and with VNFs
- ONAP Virtual Machines (VMs)
-- Public/private key pair used to access ONAP VMs
+- Public key pair used to access ONAP VMs
- Virtual interfaces towards the ONAP Private Management Network
- Disk volumes
@@ -210,7 +209,6 @@ need to be set depending on the user's environment:
openstack_tenant_id: PUT YOUR OPENSTACK PROJECT ID HERE
openstack_username: PUT YOUR OPENSTACK USERNAME HERE
openstack_api_key: PUT YOUR OPENSTACK PASSWORD HERE
- horizon_url: PUT THE HORIZON URL HERE
keystone_url: PUT THE KEYSTONE URL HERE (do not include version number)
openstack_region parameter is set to RegionOne (OpenStack default). If
@@ -314,9 +312,9 @@ or Command Line.
- Login to Horizon URL with your personal credentials
- Click "Stacks" from the "Orchestration" menu
- Click "Launch Stack"
-- Paste or manually upload the HEAT template file (onap_openstack.yaml) in the
+- Paste or manually upload the Heat template file (onap_openstack.yaml) in the
"Template Source" form
-- Paste or manually upload the HEAT environment file (onap_openstack.env) in
+- Paste or manually upload the Heat environment file (onap_openstack.env) in
the "Environment Source" form
- Click "Next" - Specify a name in the "Stack Name" form
- Provide the password in the "Password" form