From 2bc12a3cbbed5b4dfe78c649394d2cd8856757b0 Mon Sep 17 00:00:00 2001
From: st782s <statta@research.att.com>
Date: Thu, 29 Mar 2018 17:53:46 -0400
Subject: [PATCH] Update OpenStack env

Issue-ID: PORTAL-217

update the docker version in the openstack env file

Change-Id: I2e344eb8981fb9af230ad9ff5a8a448c92bd6dfe
Signed-off-by: st782s <statta@research.att.com>
---
 boot/portal_vm_init.sh       | 9 +++++----
 heat/ONAP/onap_openstack.env | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/boot/portal_vm_init.sh b/boot/portal_vm_init.sh
index 152c54d4..17640058 100755
--- a/boot/portal_vm_init.sh
+++ b/boot/portal_vm_init.sh
@@ -13,6 +13,7 @@ DOCKER_IMAGE_VERSION=$(cat /opt/config/docker_version.txt)
 # Use "latest" to deploy snapshot images:
 # DOCKER_IMAGE_VERSION=latest
 CLI_DOCKER_VERSION=$(cat /opt/config/cli_docker_version.txt)
+CDR_IMAGE_VERSION=latest
 ZK_IMAGE_VERSION=3.4
 
 # Refresh configuration and scripts
@@ -28,8 +29,8 @@ docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO
 docker pull $NEXUS_DOCKER_REPO/$DB_IMG_NAME:$DOCKER_IMAGE_VERSION
 docker pull $NEXUS_DOCKER_REPO/$EP_IMG_NAME:$DOCKER_IMAGE_VERSION
 docker pull $NEXUS_DOCKER_REPO/$SDK_IMG_NAME:$DOCKER_IMAGE_VERSION
-docker pull $NEXUS_DOCKER_REPO/$CDR_IMG_NAME:$DOCKER_IMAGE_VERSION
-docker pull $NEXUS_DOCKER_REPO/$ZK_IMG_NAME:$ZK_IMAGE_VERSION
+docker pull $NEXUS_DOCKER_REPO/$CDR_IMG_NAME:$CDR_IMAGE_VERSION
+docker pull $ZK_IMG_NAME:$ZK_IMAGE_VERSION
 docker pull $NEXUS_DOCKER_REPO/$WMS_IMG_NAME:$DOCKER_IMAGE_VERSION
 docker pull $NEXUS_DOCKER_REPO/$CLI_IMG_NAME:$CLI_DOCKER_VERSION
 
@@ -37,8 +38,8 @@ docker pull $NEXUS_DOCKER_REPO/$CLI_IMG_NAME:$CLI_DOCKER_VERSION
 docker tag $NEXUS_DOCKER_REPO/$DB_IMG_NAME:$DOCKER_IMAGE_VERSION $DB_IMG_NAME:$PORTAL_TAG
 docker tag $NEXUS_DOCKER_REPO/$EP_IMG_NAME:$DOCKER_IMAGE_VERSION $EP_IMG_NAME:$PORTAL_TAG
 docker tag $NEXUS_DOCKER_REPO/$SDK_IMG_NAME:$DOCKER_IMAGE_VERSION $SDK_IMG_NAME:$PORTAL_TAG
-docker tag $NEXUS_DOCKER_REPO/$CDR_IMG_NAME:$DOCKER_IMAGE_VERSION $CDR_IMG_NAME:$PORTAL_TAG
-docker tag $NEXUS_DOCKER_REPO/$ZK_IMG_NAME:$ZK_IMAGE_VERSION $ZK_IMG_NAME:$PORTAL_TAG
+docker tag $NEXUS_DOCKER_REPO/$CDR_IMG_NAME:$CDR_IMAGE_VERSION $CDR_IMG_NAME:$PORTAL_TAG
+docker tag $ZK_IMG_NAME:$ZK_IMAGE_VERSION $ZK_IMG_NAME:$PORTAL_TAG
 docker tag $NEXUS_DOCKER_REPO/$WMS_IMG_NAME:$DOCKER_IMAGE_VERSION $WMS_IMG_NAME:$PORTAL_TAG
 docker tag $NEXUS_DOCKER_REPO/$CLI_IMG_NAME:$CLI_DOCKER_VERSION $CLI_IMG_NAME:$PORTAL_TAG
 
diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env
index 2cf70ac0..eff00d16 100644
--- a/heat/ONAP/onap_openstack.env
+++ b/heat/ONAP/onap_openstack.env
@@ -137,7 +137,7 @@ parameters:
   so_docker: v1.1.1
   dcae_docker: v1.1.1
   policy_docker: v1.1.1
-  portal_docker: v1.3.0
+  portal_docker: 2.1-STAGING-latest
   robot_docker: 1.1-STAGING-latest
   sdc_docker: v1.1.0
   sdnc_docker: v1.2.1
-- 
2.16.6