X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=heat%2FONAP%2Fonap_openstack.env;h=20f7e9f3cb2fb11184984ce062c7aafb4ea857d8;hb=9dc66fa2f202f4b436b3dced04fa417db79ba855;hp=39bbc8ece84b5d4b4ac13377e20d901b743d7885;hpb=87c9574f9a546f606082de6ff37bc1c3d7cad805;p=demo.git

diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env
index 39bbc8ec..20f7e9f3 100644
--- a/heat/ONAP/onap_openstack.env
+++ b/heat/ONAP/onap_openstack.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,26 +104,26 @@ 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: 1.2.2
-  aai_sparky_docker: 1.2.2
+  aai_sparky_docker: 1.2.1
   appc_docker: 1.3.0
   so_docker: 1.2.2
   policy_docker: 1.2.3
@@ -143,7 +143,9 @@ parameters:
   dgbuilder_docker: 0.2.4
   cli_docker: 2.0.2
   music_docker: 2.5.3
-  oof_docker: 1.1.1
+  cassandra_music_docker: 3.0.0
+  optf_has_docker: 1.1.1
+  optf_osdf_docker: 1.1.1
   aaf_docker: 2.1.1
   sms_docker: 2.0.0
   nbi_docker: 2.0.0