Switch policy branch back to master

[demo.git] / heat / ONAP / onap_openstack.env

diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env
index a20afe5..94958c5 100644 (file)
--- 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
 
@@ -108,7 +108,7 @@ parameters:
   appc_branch: master
   so_branch: master
   mr_branch: master
-  policy_branch: beijing
+  policy_branch: master
   portal_branch: master
   robot_branch: master
   sdc_branch: master
@@ -123,12 +123,12 @@ parameters:
   oof_branch: master
 
   aai_docker: 1.2.2
-  aai_sparky_docker: 1.2.2
   appc_docker: 1.3.0
   so_docker: 1.2.2
   policy_docker: 1.2.3
   portal_docker: 2.2.0
   robot_docker: 1.2.1
+  sniro_docker: 1.0.0
   sdc_docker: 1.2.0
   sdnc_docker: 1.3.4
   vid_docker: 2.0.0
@@ -142,7 +142,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