X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=heat%2FONAP%2Fonap_openstack_template.env;h=fa73540dadba1d50198e30d28504787630a52581;hb=d9dddf18c7069718f8087ad6490d5d9fb9d6bbd5;hp=49d7933a658d45e180cdc97fd2ec6d1b0782cc7c;hpb=f32b4cbde05f59f1842bcd9b2a8efc01cfa1a7b8;p=demo.git

diff --git a/heat/ONAP/onap_openstack_template.env b/heat/ONAP/onap_openstack_template.env
index 49d7933a..fa73540d 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,26 +104,25 @@ parameters:
   #                              #
   ################################
 
-  aai_branch: beijing
-  appc_branch: beijing
-  so_branch: beijing
-  mr_branch: beijing
-  policy_branch: beijing
-  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_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}
   appc_docker: ${APPC_IMAGE_DOCKER}
   so_docker: ${MSO_DOCKER}
   policy_docker: ${POLICY_PE_DOCKER}