Merge "Allow vLB to check multiple vDNSs"

diff --git a/boot/portal_vm_init.sh b/boot/portal_vm_init.sh
index 7d1c535..152c54d 100755 (executable)
--- 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)
+ZK_IMAGE_VERSION=3.4
 
 # Refresh configuration and scripts
 cd /opt/portal
@@ -26,12 +27,18 @@ source .env
 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/$WMS_IMG_NAME:$DOCKER_IMAGE_VERSION
 docker pull $NEXUS_DOCKER_REPO/$CLI_IMG_NAME:$CLI_DOCKER_VERSION
 
 # Tag them as expected by docker-compose file
 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/$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
 
@@ -46,4 +53,4 @@ export PROPS_DIR=./properties_simpledemo
 
 # docker-compose is not in /usr/bin
 /opt/docker/docker-compose down
-/opt/docker/docker-compose up -d
+/opt/docker/docker-compose up -d
\ No newline at end of file

diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env
index 11f7a9c..2cfdaa0 100644 (file)
--- a/heat/ONAP/onap_openstack.env
+++ b/heat/ONAP/onap_openstack.env
@@ -138,7 +138,7 @@ parameters:
   robot_docker: 1.1-STAGING-latest
   sdc_docker: v1.1.0
   sdnc_docker: v1.2.1
-  vid_docker: v1.1.1
+  vid_docker: 1.2.1
   clamp_docker: 2.0-STAGING-latest
   msb_docker: 1.0.0
   mvim_docker: v1.0.0