Code Review
/
demo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
add ASDC install script
[demo.git]
/
boot
/
portal_vm_init.sh
diff --git
a/boot/portal_vm_init.sh
b/boot/portal_vm_init.sh
index
05e969f
..
e7ecfe5
100644
(file)
--- 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)
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
cd /opt/portal
git pull
@@
-14,13
+15,14
@@
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
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
docker create --name data_vol_portal -v /var/lib/mysql mariadb
-docker tag $NEXUS_DOCKER_REPO/openecomp/portaldb:
latest
ecompdb:portal
-docker tag $NEXUS_DOCKER_REPO/openecomp/portalapps:
latest
ep:1610-1
+docker tag $NEXUS_DOCKER_REPO/openecomp/portaldb:
$DOCKER_IMAGE_VERSION
ecompdb:portal
+docker tag $NEXUS_DOCKER_REPO/openecomp/portalapps:
$DOCKER_IMAGE_VERSION
ep:1610-1
docker rm -f ecompdb_portal
docker rm -f 1610-1
docker rm -f ecompdb_portal
docker rm -f 1610-1
@@
-33,7
+35,12
@@
sleep 180
if [ ! -e /opt/config/boot.txt ]
then
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
mysql -u root -p'Aa123456' -h $IP_ADDRESS < /opt/portal/deliveries/Apps_Users_OnBoarding_Script.sql
echo "yes" > /opt/config/boot.txt
fi