Update heat template using manifest versions

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

diff --git a/heat/ONAP/onap_openstack_template.env b/heat/ONAP/onap_openstack_template.env
index 9962212..b080dbd 100644 (file)
--- a/heat/ONAP/onap_openstack_template.env
+++ b/heat/ONAP/onap_openstack_template.env
@@ -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
 
   ###########################
   #                         #
@@ -120,7 +124,7 @@ parameters:
   so_branch: master
   mr_branch: master
   policy_branch: master
-  portal_branch: release-1.3.0
+  portal_branch: master
   robot_branch: master
   sdc_branch: master
   sdnc_branch: master
@@ -134,7 +138,7 @@ parameters:
   so_docker: ${MSO_DOCKER}
   dcae_docker: ${BOOTSTRAP_DOCKER}
   policy_docker: ${POLICY_DB_DOCKER}
-  portal_docker: ${PORTAL_APPS_DOCKER}
+  portal_docker: ${PORTAL_APP_DOCKER}
   robot_docker: 1.1-STAGING-latest
   sdc_docker: ${SDC_BACKEND_DOCKER}
   sdnc_docker: ${SDNC_IMAGE_DOCKER}
@@ -146,9 +150,14 @@ parameters:
   esr_docker: ${ESR_SERVER_DOCKER}
   dgbuilder_docker: ${CCSDK_DGBUILDER_IMAGE_DOCKER}
   cli_docker: ${CLI_DOCKER}
+  music_docker: ${MUSIC_DOCKER}
+  oof_docker: ${OOF_DOCKER}
+  aaf_docker: ${AAF_DOCKER}
+  nbi_docker: ${NBI_DOCKER}
 
   vfc_nokia_docker: ${NOKIA_DOCKER}
-  vfc_ztevmanagerdriver_docker: ${ZTEVMANAGERDRIVER_DOCKER}
+  vfc_nokiav2_docker: ${NOKIAV2_DOCKER}
+  vfc_ztevnfmdriver_docker: ${ZTEVNFMDRIVER_DOCKER}
   vfc_ztesdncdriver_docker: ${ZTESDNCDRIVER_DOCKER}
   vfc_vnfres_docker: ${VNFRES_DOCKER}
   vfc_vnfmgr_docker: ${VNFMGR_DOCKER}
@@ -162,6 +171,18 @@ parameters:
   vfc_catalog_docker: ${CATALOG_DOCKER}
   vfc_wfengine_mgrservice_docker: ${WFENGINE_MGRSERVICE_DOCKER}
   vfc_wfengine_activiti_docker: ${WFENGINE_ACTIVITI_DOCKER}
+  vfc_multivimproxy_docker: ${MULTIVIMPROXY_DOCKER}
+  vfc_ztevmanagerdriver_docker: ${ZTEVMANAGERDRIVER_DOCKER}
+
+  ############################################
+  #                                          #
+  # 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
 
   #####################
   #                   #