From: Gary Wu <gary.i.wu@huawei.com>
Date: Wed, 6 Jun 2018 14:02:10 +0000 (+0000)
Subject: Merge "Change release version"
X-Git-Tag: v1.2.1~11
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=1ddd3c58a74617ed1937611296fc58a37a7a93e9;hp=00d7ad6122d396b74da01f53bfd5f6aab485de17;p=demo.git

Merge "Change release version"
---

diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env
index 59a9bae7..5243429f 100644
--- a/heat/ONAP/onap_openstack.env
+++ b/heat/ONAP/onap_openstack.env
@@ -127,7 +127,7 @@ parameters:
   appc_docker: 1.3.0
   so_docker: 1.2.2
   policy_docker: 1.2.3
-  portal_docker: v2.2.0
+  portal_docker: 2.2.0
   robot_docker: 1.2.1
   sdc_docker: 1.2.0
   sdnc_docker: 1.3.4
@@ -137,7 +137,7 @@ parameters:
   mvim_docker: 1.1.2
   mvim_openstack_docker: 1.1.2
   uui_docker: latest
-  esr_docker: latest
+  esr_docker: 1.1.0
   sdc_wfd_docker: 1.1.0
   dgbuilder_docker: 0.2.4
   cli_docker: 2.0.2
@@ -162,8 +162,6 @@ parameters:
   dcae_inv_docker: 3.0.1
   dcae_ph_docker: 2.4.5
   dcae_sch_docker: 1.1.4
-  dcae_heartbeat_docker: latest
-  dcae_prh_docker: latest
   holmes_rm_docker: 1.1.0
   holmes_em_docker: 1.1.0
 
diff --git a/heat/ONAP/onap_openstack_template.env b/heat/ONAP/onap_openstack_template.env
index 6238bc2c..679875f3 100644
--- a/heat/ONAP/onap_openstack_template.env
+++ b/heat/ONAP/onap_openstack_template.env
@@ -162,8 +162,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}