Merge "fill __docker_version__ in robot_vm template"

diff --git a/boot/uui_vm_init.sh b/boot/uui_vm_init.sh
index cc2a1d8..01cee5f 100755 (executable)
--- a/boot/uui_vm_init.sh
+++ b/boot/uui_vm_init.sh
@@ -17,5 +17,5 @@ docker rm -f uui_ui
 docker rm -f uui_server
 
 # Insert docker run instructions here
-docker run -i -t -d --name uui_ui -p 8080:8080 -e MSB_ADDR=$OPENO_IP:80 -e MR_ADDR=$MR_IP:3904 $NEXUS_DOCKER_REPO/onap/usecase-ui:$DOCKER_IMAGE_VERSION
-docker run -i -t -d --name uui_server -p 8082:8082 -e MSB_ADDR=$OPENO_IP:80 $NEXUS_DOCKER_REPO/onap/usecase-ui/usecase-ui-server:$DOCKER_IMAGE_VERSION
\ No newline at end of file
+docker run -i -t -d --name uui_ui -p 8080:8080 -e MSB_ADDR=$OPENO_IP:80 $NEXUS_DOCKER_REPO/onap/usecase-ui:$DOCKER_IMAGE_VERSION
+docker run -i -t -d --name uui_server -p 8082:8082 -e MSB_ADDR=$OPENO_IP:80 -e MR_ADDR=$MR_IP:3904 $NEXUS_DOCKER_REPO/onap/usecase-ui/usecase-ui-server:$DOCKER_IMAGE_VERSION
\ No newline at end of file

diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env
index a579bf0..2b95c4a 100644 (file)
--- a/heat/ONAP/onap_openstack.env
+++ b/heat/ONAP/onap_openstack.env
@@ -131,7 +131,7 @@ parameters:
   aai_sparky_docker: v1.0.0
   appc_docker: 1.1-STAGING-latest
   so_docker: v1.1.0
-  dcae_docker: 1.1-latest
+  dcae_docker: v1.1.0
   policy_docker: v1.1.0
   portal_docker: v1.3.0
   robot_docker: 1.1-STAGING-latest