From: Gary Wu <gary.i.wu@huawei.com>
Date: Thu, 31 May 2018 02:19:53 +0000 (+0000)
Subject: Merge "Update final policy 1.2.3 image"
X-Git-Tag: v1.2.1~32
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=c3b3e8c223263d04b223644a23b7160d01ed1852;hp=-c;p=demo.git

Merge "Update final policy 1.2.3 image"
---

c3b3e8c223263d04b223644a23b7160d01ed1852
diff --combined heat/ONAP/onap_openstack.env
index 8ee8423d,da446ada..3bb9f977
--- a/heat/ONAP/onap_openstack.env
+++ b/heat/ONAP/onap_openstack.env
@@@ -122,16 -122,16 +122,16 @@@ parameters
    sms_branch: master
    oof_branch: master
  
 -  aai_docker: 1.2-STAGING-latest
 -  aai_sparky_docker: 1.2-STAGING-latest
 +  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
+   policy_docker: 1.2.3
    portal_docker: v2.2.0
    robot_docker: 1.2.0
    sdc_docker: 1.2-STAGING-latest
    sdnc_docker: 1.3-STAGING-latest
 -  vid_docker: 1.2.1
 +  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
@@@ -148,10 -148,10 +148,10 @@@
    nbi_docker: latest
    dbcl_docker: latest
  
 -  dcae_docker:  1.1.2
 +  dcae_docker:  1.1.3
    dcae_snmptrap_docker:  latest
    dcae_ves_docker:  latest
 -  dcae_bootstrap_docker: 1.1.2
 +  dcae_bootstrap_docker: 1.1.3
    dcae_cm_docker: latest
    dcae_k8sbootstrap_docker: latest
    dcae_redisc_docker: latest