From: Gary Wu <gary.i.wu@huawei.com>
Date: Wed, 4 Apr 2018 16:00:49 +0000 (-0700)
Subject: Bump docker versions using the latest manifest
X-Git-Tag: v1.2.0~100
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=45942672408b16428c1b05ce12fbb460d7560368;p=demo.git

Bump docker versions using the latest manifest

Change-Id: If8cbfd63713dff2358cc99c9836b6834bb1322eb
Issue-ID: INT-278
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
---

diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env
index 546bd920..d8029424 100644
--- a/heat/ONAP/onap_openstack.env
+++ b/heat/ONAP/onap_openstack.env
@@ -140,7 +140,7 @@ parameters:
   dcae_docker: v1.1.1
   policy_docker: v1.1.1
   portal_docker: 2.1-STAGING-latest
-  robot_docker: 1.1-STAGING-latest
+  robot_docker: 1.2-STAGING-latest
   sdc_docker: 1.2-STAGING-latest
   sdnc_docker: 1.3-STAGING-latest
   vid_docker: 1.2.1
diff --git a/heat/ONAP/onap_openstack_template.env b/heat/ONAP/onap_openstack_template.env
index b080dbdd..1eb2ff4f 100644
--- a/heat/ONAP/onap_openstack_template.env
+++ b/heat/ONAP/onap_openstack_template.env
@@ -100,6 +100,7 @@ parameters:
   #                         #
   ###########################
 
+  dcae_deployment_profile: PUT DCAE DEPLOYMENT PROFILE (R1 or R2MVP)
   dnsaas_config_enabled: PUT WHETHER TO USE PROXYED DESIGNATE
   dnsaas_region: PUT THE DESIGNATE PROVIDING OPENSTACK'S REGION HERE
   dnsaas_keystone_url: PUT THE DESIGNATE PROVIDING OPENSTACK'S KEYSTONE URL HERE
@@ -139,7 +140,7 @@ parameters:
   dcae_docker: ${BOOTSTRAP_DOCKER}
   policy_docker: ${POLICY_DB_DOCKER}
   portal_docker: ${PORTAL_APP_DOCKER}
-  robot_docker: 1.1-STAGING-latest
+  robot_docker: ${TESTSUITE_DOCKER}
   sdc_docker: ${SDC_BACKEND_DOCKER}
   sdnc_docker: ${SDNC_IMAGE_DOCKER}
   vid_docker: ${VID_DOCKER}