From 061cd2bb816ba1034f372c6013f18da71cde97e6 Mon Sep 17 00:00:00 2001
From: platania <platania@research.att.com>
Date: Wed, 22 Feb 2017 16:55:10 -0500
Subject: [PATCH] update policy and portal init

Change-Id: I5352f4f584c26011aee4b3ecfd1031006376e18f
Signed-off-by: platania <platania@research.att.com>
---
 .DS_Store              | Bin 8196 -> 8196 bytes
 boot/policy_vm_init.sh |   5 ++---
 boot/portal_vm_init.sh |  12 ++++++------
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index f1b56e31d8c1eebbe2855ab3f3605c02dd690ea1..1c33ab3e0a814cbcdc3d810b46cfba59f6452d5e 100644
GIT binary patch
delta 320
zcmZp1XmOa3%=mL-;WYM%4ZNG#Ib=8{s|&B=Ff=sOQ7|+&pL|!?U6h3(i6I{dOEQzo
z3X*d2lNcBnH%~SZROS#B6Bm_`l#-krFIXfSFTh`%T$G=a6Odn=S(2Hb7a5&il$qk6
zmR6ivGWngLuXIFaa(-TLW>qRkX-0mzCy*OZlv<XVT0S{UNUfejfH5R5F*lV{*&%=d
z3^*A$7_=E28GISS7_u3v7$!2zWmwO!o8bh*U557zKN;B>1sIhWwHZwqZ5izuJs3S1
zy%_@-0~w<r+L;(3G=mJ3hEj~tKnC1fWx+*xIr(|%li7q7Cx?lwV>7hSQLwN8`dw+V
hj;QKp6_Llx6B~FovrBwqVKf8@Z`KjL%`~xr69AhKQC<K5

delta 307
zcmZp1XmOa3%=lwt;WYM%4ZNG#Ib=8(e@vDWUd1I|U2SfxqhM%kIr*Zn64Rk0lm80H
zGaj8RD=5ymZ?dVNGKZMBgs7yHl+5G=!6Mn{^rFlZ|FpE?)RM?}0si9TqWqkkfc)aj
zlFa<P$?pYyr9q+@`Q@I;`FR0Fsb!g|<q?@cc5r4@>f~@CwR&ZT$^r%u;1FO8$xF;l
z<>XX$2mp%!#Tc|192tBW!Wgm{su(6R%w<@~u$$oo!(E2=3_ls!86_E&7_}Kq7;PEt
z89f*S8G{%@7$X^@7^5NjnHZtw$U<o-#h3zQurMSs<TFhED5Nu4SzsN9kulKQ#ui2(
aZ%_U$pt@N?<T3MRc8PB+n?H)MGXns@3QivY

diff --git a/boot/policy_vm_init.sh b/boot/policy_vm_init.sh
index af4638c9..6ebfac92 100644
--- a/boot/policy_vm_init.sh
+++ b/boot/policy_vm_init.sh
@@ -6,11 +6,10 @@ NEXUS_DOCKER_REPO=$(cat /opt/config/nexus_docker_repo.txt)
 
 cd /opt/policy
 git pull
-cd /opt
 
-chmod +x policy/config/drools/drools-tweaks.sh
+chmod +x config/drools/drools-tweaks.sh
 IP_ADDRESS=$(ifconfig eth0 | grep "inet addr" | tr -s ' ' | cut -d' ' -f3 | cut -d':' -f2)
-echo $IP_ADDRESS > /opt/policy/config/pe/ip_addr.txt
+echo $IP_ADDRESS > config/pe/ip_addr.txt
 
 docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO
 /opt/docker/docker-compose up -d
diff --git a/boot/portal_vm_init.sh b/boot/portal_vm_init.sh
index f15999ec..93fdff2e 100644
--- a/boot/portal_vm_init.sh
+++ b/boot/portal_vm_init.sh
@@ -14,13 +14,13 @@ 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:1.0.0
-docker pull $NEXUS_DOCKER_REPO/openecomp/portalapps:1.0.0
+docker pull $NEXUS_DOCKER_REPO/openecomp/portaldb:latest
+docker pull $NEXUS_DOCKER_REPO/openecomp/portalapps:latest
 
 docker create --name data_vol_portal -v /var/lib/mysql mariadb
 
-docker tag $NEXUS_DOCKER_REPO/openecomp/portaldb:1.0.0 ecompdb:portal
-docker tag $NEXUS_DOCKER_REPO/openecomp/portalapps:1.0.0 ep:1610-1
+docker tag $NEXUS_DOCKER_REPO/openecomp/portaldb:latest ecompdb:portal
+docker tag $NEXUS_DOCKER_REPO/openecomp/portalapps:latest ep:1610-1
 
 docker rm -f ecompdb_portal
 docker rm -f 1610-1
@@ -34,6 +34,6 @@ sleep 60
 if [ ! -e /opt/config/boot.txt ]
 then
   IP_ADDRESS=$(ifconfig eth0 | grep "inet addr" | tr -s ' ' | cut -d' ' -f3 | cut -d':' -f2)
-  mysql -u root -p'Aa123456' -h $IP_ADDRESS < users.sql
+  mysql -u root -p'Aa123456' -h $IP_ADDRESS < /opt/portal/deliveries/Apps_Users_OnBoarding_Script.sql
   echo "yes" > /opt/config/boot.txt
-fi
\ No newline at end of file
+fi
-- 
2.16.6