Replace docker version tags for OOF

[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 e0180c9..3378586 100644 (file)
--- a/heat/ONAP/onap_openstack_template.env
+++ b/heat/ONAP/onap_openstack_template.env
@@ -22,8 +22,6 @@ parameters:
 
   flavor_xlarge: PUT THE XLARGE FLAVOR NAME HERE
 
-  flavor_xxlarge: PUT THE XXLARGE FLAVOR NAME HERE
-
   vm_base_name: onap
 
   key_name: onap_key
@@ -52,8 +50,6 @@ parameters:
 
   openstack_region: RegionOne
 
-  horizon_url: PUT THE HORIZON URL HERE
-
   keystone_url: PUT THE KEYSTONE URL HERE (do not include version number)
 
   cloud_env: openstack
@@ -112,7 +108,7 @@ parameters:
   appc_branch: master
   so_branch: master
   mr_branch: master
-  policy_branch: master
+  policy_branch: beijing
   portal_branch: master
   robot_branch: master
   sdc_branch: master
@@ -133,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}
@@ -146,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}
@@ -166,8 +165,6 @@ parameters:
   dcae_inv_docker: ${INVENTORY_API_DOCKER}
   dcae_ph_docker: ${POLICY_HANDLER_DOCKER}
   dcae_sch_docker: ${SERVICECHANGE_HANDLER_DOCKER}
-  dcae_heartbeat_docker: ${HEARTBEAT_DOCKER}
-  dcae_prh_docker: ${PRH_APP_SERVER_DOCKER}
   holmes_rm_docker: ${RULE_MANAGEMENT_DOCKER}
   holmes_em_docker: ${ENGINE_MANAGEMENT_DOCKER}