From 744d9f5f476b4f96371dc5adeab3b9a9cc6b24ae Mon Sep 17 00:00:00 2001 From: Gary Wu Date: Thu, 30 Aug 2018 09:44:33 -0700 Subject: [PATCH] Sync HEAT template with staging manifest versions Change-Id: I20ecacc10f518aeee064ef11603290baf2d356a6 Issue-ID: INT-586 Signed-off-by: Gary Wu --- heat/ONAP/onap_openstack.env | 32 ++++++++++++++++---------------- heat/ONAP/onap_openstack_template.env | 2 +- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env index 1aa7d223..b9fc2e6c 100644 --- a/heat/ONAP/onap_openstack.env +++ b/heat/ONAP/onap_openstack.env @@ -126,29 +126,29 @@ parameters: oof_branch: master aai_docker: "1.2.2" - appc_docker: "1.3.0" - so_docker: "1.2.2" - policy_docker: "1.2.3" + appc_docker: "1.4.0-SNAPSHOT-latest" + so_docker: "1.3.0-STAGING-latest" + policy_docker: "1.3-SNAPSHOT-latest" portal_docker: "2.2.0" - robot_docker: "1.3.0" + robot_docker: "1.3.1-STAGING-latest" sniro_docker: "1.0.0" - 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" + sdc_docker: "1.3-STAGING-latest" + sdnc_docker: "1.4-STAGING-latest" + vid_docker: "3.0-STAGING-latest" + clamp_docker: "3.0-STAGING-latest" + msb_docker: "1.2.0-STAGING-latest" + mvim_docker: "1.2.0-STAGING" + mvim_openstack_docker: "1.2.0-STAGING" uui_docker: "1.1.1" esr_docker: "1.1.0" sdc_wfd_docker: "1.1.0" - dgbuilder_docker: "0.2.4" + dgbuilder_docker: "0.3-STAGING-latest" cli_docker: "2.0.2" music_docker: "2.5.3" cassandra_music_docker: "3.0.0" optf_has_docker: "1.1.1" optf_osdf_docker: "1.1.1" - aaf_docker: "2.1.1" + aaf_docker: "2.1.2-SNAPSHOT" sms_docker: "2.0.0" nbi_docker: "2.0.0" dbcl_docker: "1.0.12" @@ -167,10 +167,10 @@ parameters: 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" + holmes_rm_docker: "1.2.0-STAGING-latest" + holmes_em_docker: "1.2.0-STAGING-latest" - vfc_db_docker: "" + vfc_db_docker: "1.1.0-STAGING-latest" vfc_nokia_docker: "1.1.0" vfc_nokiav2_docker: "1.1.0" vfc_ztevnfmdriver_docker: "1.1.0" diff --git a/heat/ONAP/onap_openstack_template.env b/heat/ONAP/onap_openstack_template.env index 5ca2b549..af560124 100644 --- a/heat/ONAP/onap_openstack_template.env +++ b/heat/ONAP/onap_openstack_template.env @@ -127,7 +127,7 @@ parameters: aai_docker: "${AAI_RESOURCES_DOCKER}" appc_docker: "${APPC_IMAGE_DOCKER}" - so_docker: "${MSO_DOCKER}" + so_docker: "${API_HANDLER_INFRA_DOCKER}" policy_docker: "${POLICY_PE_DOCKER}" portal_docker: "${PORTAL_APP_DOCKER}" robot_docker: "${TESTSUITE_DOCKER}" -- 2.16.6