X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=heat%2FONAP%2Fonap_openstack_template.env;h=889368b44409b694366892a7bf6ee5747c0f16ef;hb=9dc66fa2f202f4b436b3dced04fa417db79ba855;hp=679875f3fc7c9150b3cdd2d9f27b46dbe6fabcfa;hpb=dcd8549cddda82a25a55844d1f21693a25394ef7;p=demo.git

diff --git a/heat/ONAP/onap_openstack_template.env b/heat/ONAP/onap_openstack_template.env
index 679875f3..889368b4 100644
--- a/heat/ONAP/onap_openstack_template.env
+++ b/heat/ONAP/onap_openstack_template.env
@@ -36,7 +36,7 @@ parameters:
 
   dmaap_topic: AUTO
 
-  artifacts_version: 1.2.1-SNAPSHOT
+  artifacts_version: 1.2.1
 
   openstack_tenant_id: PUT YOUR OPENSTACK PROJECT ID HERE
 
@@ -104,31 +104,32 @@ parameters:
   #                              #
   ################################
 
-  aai_branch: master
-  appc_branch: master
-  so_branch: master
-  mr_branch: master
-  policy_branch: beijing
-  portal_branch: master
-  robot_branch: master
-  sdc_branch: master
-  sdnc_branch: master
-  vid_branch: master
-  clamp_branch: master
-  vnfsdk_branch: master
-  music_branch: master
-  nbi_branch: master
-  aaf_branch: master
-  sms_branch: master
-  oof_branch: master
+  aai_branch: 2.0.0-ONAP
+  appc_branch: 2.0.0-ONAP
+  so_branch: 2.0.0-ONAP
+  mr_branch: 2.0.0-ONAP
+  policy_branch: 2.0.0-ONAP
+  portal_branch: 2.0.0-ONAP
+  robot_branch: 2.0.0-ONAP
+  sdc_branch: 2.0.0-ONAP
+  sdnc_branch: 2.0.0-ONAP
+  vid_branch: 2.0.0-ONAP
+  clamp_branch: 2.0.0-ONAP
+  vnfsdk_branch: 2.0.0-ONAP
+  music_branch: 2.0.0-ONAP
+  nbi_branch: 2.0.0-ONAP
+  aaf_branch: 2.0.0-ONAP
+  sms_branch: 2.0.0-ONAP
+  oof_branch: 2.0.0-ONAP
 
   aai_docker: ${AAI_RESOURCES_DOCKER}
-  aai_sparky_docker: ${AAI_RESOURCES_DOCKER}
+  aai_sparky_docker: ${SPARKY_BE_DOCKER}
   appc_docker: ${APPC_IMAGE_DOCKER}
   so_docker: ${MSO_DOCKER}
   policy_docker: ${POLICY_PE_DOCKER}
   portal_docker: ${PORTAL_APP_DOCKER}
   robot_docker: ${TESTSUITE_DOCKER}
+  sniro_docker: ${SNIROEMULATOR_DOCKER}
   sdc_docker: ${SDC_BACKEND_DOCKER}
   sdnc_docker: ${SDNC_IMAGE_DOCKER}
   vid_docker: ${VID_DOCKER}
@@ -142,7 +143,9 @@ parameters:
   dgbuilder_docker: ${CCSDK_DGBUILDER_IMAGE_DOCKER}
   cli_docker: ${CLI_DOCKER}
   music_docker: ${MUSIC_DOCKER}
-  oof_docker: ${OPTF_OSDF_DOCKER}
+  cassandra_music_docker: ${CASSANDRA_MUSIC_DOCKER}
+  optf_has_docker: ${OPTF_HAS_DOCKER}
+  optf_osdf_docker: ${OPTF_OSDF_DOCKER}
   aaf_docker: ${AAF_SERVICE_DOCKER}
   sms_docker: ${SMS_DOCKER}
   nbi_docker: ${NBI_DOCKER}