Merge "Change release version"

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

diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env
index 8ee8423..5243429 100644 (file)
--- a/heat/ONAP/onap_openstack.env
+++ b/heat/ONAP/onap_openstack.env
@@ -108,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
@@ -122,68 +122,66 @@ parameters:
   sms_branch: master
   oof_branch: master
 
-  aai_docker: 1.2.1
-  aai_sparky_docker: 1.2.1
-  appc_docker: 1.3.0-SNAPSHOT-latest
-  so_docker: 1.2.1
-  policy_docker: 1.2.2
-  portal_docker: v2.2.0
-  robot_docker: 1.2.0
-  sdc_docker: 1.2-STAGING-latest
-  sdnc_docker: 1.3-STAGING-latest
-  vid_docker: 2.0-STAGING-latest
-  clamp_docker: 2.0-STAGING-latest
-  msb_docker: 1.1.0-STAGING-latest
-  mvim_docker: 1.1.2-STAGING
-  mvim_openstack_docker: 1.1.2-SNAPSHOT
+  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
+  sdc_docker: 1.2.0
+  sdnc_docker: 1.3.4
+  vid_docker: 2.0.0
+  clamp_docker: 2.0.2
+  msb_docker: 1.1.0
+  mvim_docker: 1.1.2
+  mvim_openstack_docker: 1.1.2
   uui_docker: latest
-  esr_docker: latest
-  sdc_wfd_docker: 1.1.0-SNAPSHOT-STAGING-latest
-  dgbuilder_docker: 0.2-STAGING-latest
+  esr_docker: 1.1.0
+  sdc_wfd_docker: 1.1.0
+  dgbuilder_docker: 0.2.4
   cli_docker: 2.0.2
   music_docker: latest
-  oof_docker: latest
-  aaf_docker: 2.1.0-SNAPSHOT
+  oof_docker: 1.1.1
+  aaf_docker: 2.1.1
   sms_docker: latest
-  nbi_docker: latest
-  dbcl_docker: latest
+  nbi_docker: 2.0.0
+  dbcl_docker: 1.0.12
 
   dcae_docker:  1.1.3
-  dcae_snmptrap_docker:  latest
-  dcae_ves_docker:  latest
+  dcae_snmptrap_docker:  1.3.0
+  dcae_ves_docker:  1.2.0
   dcae_bootstrap_docker: 1.1.3
-  dcae_cm_docker: latest
-  dcae_k8sbootstrap_docker: latest
-  dcae_redisc_docker: latest
-  dcae_tca_docker: latest
-  dcae_cb_docker: v4.0.0
-  dcae_cbs_docker: latest
-  dcae_dh_docker: latest
-  dcae_inv_docker: latest
-  dcae_ph_docker: latest
-  dcae_sch_docker: latest
-  dcae_heartbeat_docker: latest
-  dcae_prh_docker: latest
-  holmes_rm_docker: latest
-  holmes_em_docker: latest
-
-  vfc_nokia_docker: 1.1.0-STAGING-latest
-  vfc_nokiav2_docker: 1.1.0-STAGING-latest
-  vfc_ztevnfmdriver_docker: 1.1.0-STAGING-latest
-  vfc_ztesdncdriver_docker: 1.1.0-STAGING-latest
-  vfc_vnfres_docker: 1.1.0-STAGING-latest
-  vfc_vnfmgr_docker: 1.1.0-STAGING-latest
-  vfc_vnflcm_docker: 1.1.0-STAGING-latest
-  vfc_resmanagement_docker: 1.1.0-STAGING-latest
-  vfc_nslcm_docker: 1.1.0-STAGING-latest
-  vfc_huawei_docker: 1.1.0-STAGING-latest
-  vfc_jujudriver_docker: 1.1.0-STAGING-latest
-  vfc_gvnfmdriver_docker: 1.1.0-STAGING-latest
-  vfc_emsdriver_docker: 1.1.0-STAGING-latest
-  vfc_catalog_docker: 1.1.0-STAGING-latest
-  vfc_wfengine_mgrservice_docker: latest
-  vfc_wfengine_activiti_docker: latest
-  vfc_multivimproxy_docker: 1.0.0-STAGING-latest
+  dcae_cm_docker: 1.3.0
+  dcae_k8sbootstrap_docker: 1.1.11
+  dcae_redisc_docker: 1.0.0
+  dcae_tca_docker: 1.1.0
+  dcae_cb_docker: 4.1.0
+  dcae_cbs_docker: 2.1.5
+  dcae_dh_docker: 2.1.5
+  dcae_inv_docker: 3.0.1
+  dcae_ph_docker: 2.4.5
+  dcae_sch_docker: 1.1.4
+  holmes_rm_docker: 1.1.0
+  holmes_em_docker: 1.1.0
+
+  vfc_nokia_docker: 1.1.0
+  vfc_nokiav2_docker: 1.1.0
+  vfc_ztevnfmdriver_docker: 1.1.0
+  vfc_ztesdncdriver_docker: 1.1.0
+  vfc_vnfres_docker: 1.1.0
+  vfc_vnfmgr_docker: 1.1.0
+  vfc_vnflcm_docker: 1.1.0
+  vfc_resmanagement_docker: 1.1.0
+  vfc_nslcm_docker: 1.1.0
+  vfc_huawei_docker: 1.1.0
+  vfc_jujudriver_docker: 1.1.0
+  vfc_gvnfmdriver_docker: 1.1.0
+  vfc_emsdriver_docker: 1.1.0
+  vfc_catalog_docker: 1.1.0
+  vfc_wfengine_mgrservice_docker: 1.1.0
+  vfc_wfengine_activiti_docker: 1.1.0
+  vfc_multivimproxy_docker: 1.0.0
 
   #####################
   #                   #