X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=boot%2Fportal_vm_init.sh;h=b3f2d650bc40c4437f17f6cfd47742399b510a82;hb=97cb6ae906e8328c7ef785cd7f349cf56ff9489f;hp=93fdff2e99713dd5a0ea0182c3eb39a5a31f6295;hpb=061cd2bb816ba1034f372c6013f18da71cde97e6;p=demo.git

diff --git a/boot/portal_vm_init.sh b/boot/portal_vm_init.sh
index 93fdff2e..b3f2d650 100644
--- a/boot/portal_vm_init.sh
+++ b/boot/portal_vm_init.sh
@@ -3,6 +3,7 @@
 NEXUS_USERNAME=$(cat /opt/config/nexus_username.txt)
 NEXUS_PASSWD=$(cat /opt/config/nexus_password.txt)
 NEXUS_DOCKER_REPO=$(cat /opt/config/nexus_docker_repo.txt)
+DOCKER_IMAGE_VERSION=$(cat /opt/config/docker_version.txt)
 
 cd /opt/portal
 git pull
@@ -14,8 +15,9 @@ chmod +x portal/deliveries/dbstart.sh
 unzip -o portal/deliveries/etc.zip -d /PROJECT/OpenSource/UbuntuEP/
 
 docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO
-docker pull $NEXUS_DOCKER_REPO/openecomp/portaldb:latest
-docker pull $NEXUS_DOCKER_REPO/openecomp/portalapps:latest
+
+docker pull $NEXUS_DOCKER_REPO/openecomp/portaldb:$DOCKER_IMAGE_VERSION
+docker pull $NEXUS_DOCKER_REPO/openecomp/portalapps:$DOCKER_IMAGE_VERSION
 
 docker create --name data_vol_portal -v /var/lib/mysql mariadb
 
@@ -29,11 +31,16 @@ cd portal/deliveries
 ./dbstart.sh
 ./new_start.sh
 
-sleep 60
+sleep 180
 
 if [ ! -e /opt/config/boot.txt ]
 then
-  IP_ADDRESS=$(ifconfig eth0 | grep "inet addr" | tr -s ' ' | cut -d' ' -f3 | cut -d':' -f2)
+  if [ -e /opt/config/public_ip.txt ]
+  then
+    IP_ADDRESS=$(cat /opt/config/public_ip.txt)
+  else
+    IP_ADDRESS=$(ifconfig eth0 | grep "inet addr" | tr -s ' ' | cut -d' ' -f3 | cut -d':' -f2)
+  fi
   mysql -u root -p'Aa123456' -h $IP_ADDRESS < /opt/portal/deliveries/Apps_Users_OnBoarding_Script.sql
   echo "yes" > /opt/config/boot.txt
 fi