X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=heat%2FONAP%2Fonap_openstack_template.env;h=49d7933a658d45e180cdc97fd2ec6d1b0782cc7c;hb=f32b4cbde05f59f1842bcd9b2a8efc01cfa1a7b8;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..49d7933a 100644
--- a/heat/ONAP/onap_openstack_template.env
+++ b/heat/ONAP/onap_openstack_template.env
@@ -104,23 +104,23 @@ parameters:
   #                              #
   ################################
 
-  aai_branch: master
-  appc_branch: master
-  so_branch: master
-  mr_branch: master
+  aai_branch: beijing
+  appc_branch: beijing
+  so_branch: beijing
+  mr_branch: beijing
   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
+  portal_branch: beijing
+  robot_branch: beijing
+  sdc_branch: beijing
+  sdnc_branch: beijing
+  vid_branch: beijing
+  clamp_branch: beijing
+  vnfsdk_branch: beijing
+  music_branch: beijing
+  nbi_branch: beijing
+  aaf_branch: beijing
+  sms_branch: beijing
+  oof_branch: beijing
 
   aai_docker: ${AAI_RESOURCES_DOCKER}
   aai_sparky_docker: ${AAI_RESOURCES_DOCKER}
@@ -129,6 +129,7 @@ parameters:
   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}