From 638615104024658d5c49ee4f385e1d092a4c0f5b Mon Sep 17 00:00:00 2001
From: Gary Wu <gary.i.wu@huawei.com>
Date: Tue, 3 Apr 2018 14:01:06 -0700
Subject: [PATCH] Update heat template using manifest versions

Change-Id: I033a9d8827f23192bbd50cb071ac68a63bb3bb63
Issue-ID: INT-444
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
---
 heat/ONAP/onap_openstack.env          | 52 +++++++++++++++++------------------
 heat/ONAP/onap_openstack_template.env |  2 +-
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env
index 93f8e4ae..5798e160 100644
--- a/heat/ONAP/onap_openstack.env
+++ b/heat/ONAP/onap_openstack.env
@@ -134,45 +134,45 @@ parameters:
 
   aai_docker: 1.2-STAGING-latest
   aai_sparky_docker: 1.2-STAGING-latest
-  appc_docker: v1.2.0
-  so_docker: v1.1.1
+  appc_docker: 1.3.0-SNAPSHOT-latest
+  so_docker: 1.2.1
   dcae_docker: v1.1.1
   policy_docker: v1.1.1
   portal_docker: 2.1-STAGING-latest
   robot_docker: 1.1-STAGING-latest
-  sdc_docker: v1.1.0
-  sdnc_docker: v1.2.1
+  sdc_docker: 1.2-STAGING-latest
+  sdnc_docker: 1.3-STAGING-latest
   vid_docker: 1.2.1
   clamp_docker: 2.0-STAGING-latest
-  msb_docker: 1.0.0
+  msb_docker: 1.1.0-STAGING-latest
   mvim_docker: v1.0.0
-  uui_docker: v1.0.1
-  esr_docker: v1.0.0
-  dgbuilder_docker: v0.1.0
+  uui_docker: 1.1.0-SNAPSHOT-STAGING-latest
+  esr_docker: 1.1.0-SNAPSHOT
+  dgbuilder_docker: 0.2.1-SNAPSHOT
   cli_docker: v1.1.0
   music_docker: latest
   oof_docker: latest
   aaf_docker: latest
   nbi_docker: latest
 
-  vfc_nokia_docker: v1.0.2
+  vfc_nokia_docker: 1.1.0-STAGING-latest
   vfc_nokiav2_docker: 1.1.0-STAGING-latest
-  vfc_ztevnfmdriver_docker: v1.0.2
-  vfc_ztevmanagerdriver_docker: v1.0.0
-  vfc_ztesdncdriver_docker: v1.0.0
-  vfc_vnfres_docker: v1.0.1
-  vfc_vnfmgr_docker: v1.0.1
-  vfc_vnflcm_docker: v1.0.1
-  vfc_resmanagement_docker: v1.0.0
-  vfc_nslcm_docker: v1.0.2
-  vfc_huawei_docker: v1.0.2
-  vfc_jujudriver_docker: v1.0.0
-  vfc_gvnfmdriver_docker: v1.0.1
-  vfc_emsdriver_docker: v1.0.1
-  vfc_catalog_docker: v1.0.2
-  vfc_wfengine_mgrservice_docker: v1.0.0
-  vfc_wfengine_activiti_docker: v1.0.0
-  vfc_multivimproxy_docker: v1.0.0
+  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
+  vfc_ztevmanagerdriver_docker: 1.0.3-STAGING-latest
 
   ############################################
   #                                          #
@@ -182,7 +182,7 @@ parameters:
 
   cbam_username: onapUsername #PUT USERNAME REGISTERED INTO THE NOKIA VNFM, LEAVE AS IS IF NOT USING NOKIA SVNFM
   cbam_password: onapPassword #PUT PASSWORD REGISTERED INTO THE NOKIA VNFM, LEAVE AS IS IF NOT USING NOKIA SVNFM
-  cbam_ip: kuku #PUT THE NOKIA VNFM IP ADDRESS HERE, LEAVE AS IS IF NOT USING NOKIA SVNFM 
+  cbam_ip: kuku #PUT THE NOKIA VNFM IP ADDRESS HERE, LEAVE AS IS IF NOT USING NOKIA SVNFM
 
   #####################
   #                   #
diff --git a/heat/ONAP/onap_openstack_template.env b/heat/ONAP/onap_openstack_template.env
index fb8c6787..b080dbdd 100644
--- a/heat/ONAP/onap_openstack_template.env
+++ b/heat/ONAP/onap_openstack_template.env
@@ -138,7 +138,7 @@ parameters:
   so_docker: ${MSO_DOCKER}
   dcae_docker: ${BOOTSTRAP_DOCKER}
   policy_docker: ${POLICY_DB_DOCKER}
-  portal_docker: ${PORTAL_APPS_DOCKER}
+  portal_docker: ${PORTAL_APP_DOCKER}
   robot_docker: 1.1-STAGING-latest
   sdc_docker: ${SDC_BACKEND_DOCKER}
   sdnc_docker: ${SDNC_IMAGE_DOCKER}
-- 
2.16.6