Add missing NBI heat env values

[demo.git] / heat / ONAP / onap_openstack.env

diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env
index 2b95c4a..675fb55 100644 (file)
--- a/heat/ONAP/onap_openstack.env
+++ b/heat/ONAP/onap_openstack.env
@@ -24,7 +24,7 @@ parameters:
 
   flavor_xxlarge: PUT THE XXLARGE FLAVOR NAME HERE
 
-  vm_base_name: vm1
+  vm_base_name: onap
 
   key_name: onap_key
 
@@ -40,7 +40,7 @@ parameters:
 
   dmaap_topic: AUTO
 
-  artifacts_version: 1.1.0-SNAPSHOT
+  artifacts_version: 1.2.0-SNAPSHOT
 
   openstack_tenant_id: PUT YOUR OPENSTACK PROJECT ID HERE
 
@@ -89,6 +89,10 @@ parameters:
   vid_ip_addr: 10.0.8.1
   clamp_ip_addr: 10.0.12.1
   openo_ip_addr: 10.0.14.1
+  music_ip_addr: 10.0.15.1
+  oof_ip_addr: 10.0.16.1
+  aaf_ip_addr: 10.0.13.1
+  nbi_ip_addr: 10.0.17.1
 
   ###########################
   #                         #
@@ -111,6 +115,7 @@ parameters:
   ################################
   #                              #
   # Docker versions and branches #
+  # Generated using onap_openstack_template.env and manifest-to-env.sh
   #                              #
   ################################
 
@@ -119,49 +124,64 @@ parameters:
   so_branch: master
   mr_branch: master
   policy_branch: master
-  portal_branch: release-1.3.0
+  portal_branch: master
   robot_branch: master
-  sdc_branch: release-1.1.0
-  sdnc_branch: release-1.1.0
+  sdc_branch: master
+  sdnc_branch: master
   vid_branch: master
   clamp_branch: master
   vnfsdk_branch: master
 
-  aai_docker: v1.1.0
-  aai_sparky_docker: v1.0.0
-  appc_docker: 1.1-STAGING-latest
-  so_docker: v1.1.0
-  dcae_docker: v1.1.0
-  policy_docker: v1.1.0
-  portal_docker: v1.3.0
+  aai_docker: 1.2-STAGING-latest
+  aai_sparky_docker: 1.2-STAGING-latest
+  appc_docker: v1.2.0
+  so_docker: v1.1.1
+  dcae_docker: v1.1.1
+  policy_docker: v1.1.1
+  portal_docker: 2.1-STAGING-latest
   robot_docker: 1.1-STAGING-latest
-  sdc_docker: 1.1-STAGING-latest
-  sdnc_docker: 1.2-STAGING-latest
-  vid_docker: v1.1.0
-  clamp_docker: v1.1.0
-  msb_docker: v1.0.0
-  mvim_docker: latest
-  uui_docker: latest
+  sdc_docker: v1.1.0
+  sdnc_docker: v1.2.1
+  vid_docker: 1.2.1
+  clamp_docker: 2.0-STAGING-latest
+  msb_docker: 1.0.0
+  mvim_docker: v1.0.0
+  uui_docker: v1.0.1
   esr_docker: v1.0.0
-  dgbuilder_docker: 0.1-STAGING-latest
+  dgbuilder_docker: v0.1.0
   cli_docker: v1.1.0
-
-  vfc_nokia_docker: v1.0.0
-  vfc_ztevmanagerdriver_docker: v1.0.1
-  vfc_ztesdncdriver_docker: v1.0.1
+  music_docker: latest
+  oof_docker: latest
+  aaf_docker: latest
+  nbi_docker: latest
+
+  vfc_nokia_docker: v1.0.2
+  vfc_nokiav2_docker: 1.1.0-STAGING-latest
+  vfc_ztevnfmdriver_docker: v1.0.2
+  vfc_ztesdncdriver_docker: v1.0.0
   vfc_vnfres_docker: v1.0.1
   vfc_vnfmgr_docker: v1.0.1
   vfc_vnflcm_docker: v1.0.1
   vfc_resmanagement_docker: v1.0.0
-  vfc_nslcm_docker: v1.0.1
-  vfc_huawei_docker: v1.0.0
+  vfc_nslcm_docker: v1.0.2
+  vfc_huawei_docker: v1.0.2
   vfc_jujudriver_docker: v1.0.0
   vfc_gvnfmdriver_docker: v1.0.1
   vfc_emsdriver_docker: v1.0.1
-  vfc_catalog_docker: v1.0.1
+  vfc_catalog_docker: v1.0.2
   vfc_wfengine_mgrservice_docker: v1.0.0
   vfc_wfengine_activiti_docker: v1.0.0
 
+  ############################################
+  #                                          #
+  # Parameters used by Nokia v2 SVNFM driver #
+  #                                          #
+  ############################################
+
+  cbam_username: onapUsername #PUT USERNAME REGISTERED INTO THE NOKIA VNFM, LEAVE AS IS IF NOT USING NOKIA SVNFM
+  cbam_password: onapPassword #PUT PASSWORD REGISTERED INTO THE NOKIA VNFM, LEAVE AS IS IF NOT USING NOKIA SVNFM
+  cbam_ip: kuku #PUT THE NOKIA VNFM IP ADDRESS HERE, LEAVE AS IS IF NOT USING NOKIA SVNFM 
+
   #####################
   #                   #
   # ONAP repositories #