Merge "Install MUSIC containers via Heat"

[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 1e5a06e..5bbd9ab 100644 (file)
--- a/heat/ONAP/onap_openstack_template.env
+++ b/heat/ONAP/onap_openstack_template.env
@@ -92,6 +92,7 @@ parameters:
   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
 
   ###########################
   #                         #
@@ -99,6 +100,7 @@ parameters:
   #                         #
   ###########################
 
+  dcae_deployment_profile: PUT DCAE DEPLOYMENT PROFILE (R1 or R2MVP)
   dnsaas_config_enabled: PUT WHETHER TO USE PROXYED DESIGNATE
   dnsaas_region: PUT THE DESIGNATE PROVIDING OPENSTACK'S REGION HERE
   dnsaas_keystone_url: PUT THE DESIGNATE PROVIDING OPENSTACK'S KEYSTONE URL HERE
@@ -130,6 +132,7 @@ parameters:
   vid_branch: master
   clamp_branch: master
   vnfsdk_branch: master
+  music_branch: master
 
   aai_docker: ${AAI_RESOURCES_DOCKER}
   aai_sparky_docker: ${AAI_RESOURCES_DOCKER}
@@ -137,8 +140,8 @@ parameters:
   so_docker: ${MSO_DOCKER}
   dcae_docker: ${BOOTSTRAP_DOCKER}
   policy_docker: ${POLICY_DB_DOCKER}
-  portal_docker: ${PORTAL_APPS_DOCKER}
-  robot_docker: 1.1-STAGING-latest
+  portal_docker: ${PORTAL_APP_DOCKER}
+  robot_docker: ${TESTSUITE_DOCKER}
   sdc_docker: ${SDC_BACKEND_DOCKER}
   sdnc_docker: ${SDNC_IMAGE_DOCKER}
   vid_docker: ${VID_DOCKER}
@@ -152,6 +155,7 @@ parameters:
   music_docker: ${MUSIC_DOCKER}
   oof_docker: ${OOF_DOCKER}
   aaf_docker: ${AAF_DOCKER}
+  nbi_docker: ${NBI_DOCKER}
 
   vfc_nokia_docker: ${NOKIA_DOCKER}
   vfc_nokiav2_docker: ${NOKIAV2_DOCKER}
@@ -169,6 +173,7 @@ 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}
 
   ############################################
   #                                          #
@@ -197,3 +202,4 @@ parameters:
   vid_repo: http://gerrit.onap.org/r/vid.git
   clamp_repo: http://gerrit.onap.org/r/clamp.git
   vnfsdk_repo: http://gerrit.onap.org/r/vnfsdk/refrepo.git
+  music_repo: http://gerrit.onap.org/r/music.git