summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorplatania <platania@research.att.com>2017-02-22 16:55:10 -0500
committerplatania <platania@research.att.com>2017-02-22 16:55:10 -0500
commit061cd2bb816ba1034f372c6013f18da71cde97e6 (patch)
tree2dd632e722b76c84b5c9cad583ba7ce3e173d943
parent4f98547c03dc9c8a295ae46e066ff09dd961d5a3 (diff)
update policy and portal init
Change-Id: I5352f4f584c26011aee4b3ecfd1031006376e18f Signed-off-by: platania <platania@research.att.com>
-rw-r--r--.DS_Storebin8196 -> 8196 bytes
-rw-r--r--boot/policy_vm_init.sh5
-rw-r--r--boot/portal_vm_init.sh12
3 files changed, 8 insertions, 9 deletions
diff --git a/.DS_Store b/.DS_Store
index f1b56e31..1c33ab3e 100644
--- a/.DS_Store
+++ b/.DS_Store
Binary files differ
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