Switch policy branch back to master

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

diff --git a/heat/ONAP/onap_openstack_template.env b/heat/ONAP/onap_openstack_template.env
index 16c94d2..98aedd9 100644 (file)
--- 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
 
@@ -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,7 +123,6 @@ parameters:
   oof_branch: master
 
   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}
@@ -143,7 +142,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}