summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Lott (cl778h) <clott@research.att.com>2017-08-23 15:31:22 -0400
committerChristopher Lott (cl778h) <clott@research.att.com>2017-08-24 21:12:17 -0400
commit58c24827b1c2ec56b8d4931b29e78d17b448fb36 (patch)
treef12c32b7208f5b529ff88373f3ea1e8b7bce48a4
parentb4b77932902a99aeecc63cb80cf51c04058b24f4 (diff)
Replicate demo/boot/portal_vm_init.shrelease-1.1.0
Capture version 1.1.0 of the Portal VM init script which is compatible with the code on this branch, in prep for pushing a new version before that project creates branch 1.1.0. Issue: PORTAL-54 Change-Id: I3bde548bdb1d584046be4d92e8b0399df3af5823 Signed-off-by: Christopher Lott (cl778h) <clott@research.att.com>
-rw-r--r--.gitreview3
-rwxr-xr-xdeliveries/build_portalapps_dockers.sh3
-rwxr-xr-xdeliveries/portal_vm_init.sh71
3 files changed, 75 insertions, 2 deletions
diff --git a/.gitreview b/.gitreview
index 34ccaa2d..4a3a167a 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,4 +1,5 @@
[gerrit]
host=gerrit.onap.org
port=29418
-project=portal.git \ No newline at end of file
+project=portal.git
+defaultbranch=release-1.1.0
diff --git a/deliveries/build_portalapps_dockers.sh b/deliveries/build_portalapps_dockers.sh
index a45e55cc..facd9043 100755
--- a/deliveries/build_portalapps_dockers.sh
+++ b/deliveries/build_portalapps_dockers.sh
@@ -84,7 +84,8 @@ fi
cd $BASE/sdk/ecomp-sdk/epsdk-app-os
${MVN} clean package
-cp target/epsdk-app-os.war $OUT
+# Version was part of the final name in 1.1.0
+cp target/epsdk-app-os-1.1.0.war $OUT/epsdk-app-os.war
cd $BASE/dmaapbc/dcae_dmaapbc_webapp
${MVN} clean package
diff --git a/deliveries/portal_vm_init.sh b/deliveries/portal_vm_init.sh
new file mode 100755
index 00000000..5f34aae8
--- /dev/null
+++ b/deliveries/portal_vm_init.sh
@@ -0,0 +1,71 @@
+#!/bin/bash
+# Starts docker containers for ONAP Portal
+
+# be verbose
+set -x
+
+# Refresh source area with start scripts
+cd /opt/portal
+git pull
+cd /opt
+
+# Establish environment variables
+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)
+
+# Get container, image and tag names used below
+source portal/deliveries/os_settings.sh
+
+# Unpack property files
+unzip -o portal/deliveries/etc.zip -d /PROJECT/OpenSource/UbuntuEP/
+
+# Refresh images
+docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO
+docker pull $NEXUS_DOCKER_REPO/openecomp/${DB_TAG_NAME}:$DOCKER_IMAGE_VERSION
+docker pull $NEXUS_DOCKER_REPO/openecomp/${EP_TAG_NAME}:$DOCKER_IMAGE_VERSION
+docker pull $NEXUS_DOCKER_REPO/openecomp/${WMS_TAG_NAME}:$DOCKER_IMAGE_VERSION
+
+# Remove lingering containers; order matters.
+docker rm -f $DB_CONT_NAME
+docker rm -f $DB_VOL_NAME
+docker rm -f $EP_CONT_NAME
+docker rm -f $WMS_CONT_NAME
+
+docker create --name $DB_VOL_NAME -v /var/lib/mysql mariadb
+docker tag $NEXUS_DOCKER_REPO/openecomp/${DB_TAG_NAME}:$DOCKER_IMAGE_VERSION $DB_IMG_NAME
+docker tag $NEXUS_DOCKER_REPO/openecomp/${EP_TAG_NAME}:$DOCKER_IMAGE_VERSION $EP_IMG_NAME
+# WMS image has no version in the registry
+docker tag $NEXUS_DOCKER_REPO/openecomp/${WMS_TAG_NAME}:$DOCKER_IMAGE_VERSION ${WMS_IMG_NAME}:latest
+
+# Recreate the named containers
+cd portal/deliveries
+echo "Starting database"
+./dbstart.sh
+echo "Delaying for database"
+sleep 10
+echo "Starting apps"
+./new_start.sh
+echo "Starting widget-ms"
+./widget_ms_start.sh
+
+sleep 180
+
+if [ ! -e /opt/config/boot.txt ]
+then
+ 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
+ # Wait until MySQL is running...
+ while [[ $(netstat -vulntp |grep -i mysql | awk '{print $4}') != ":::3306" ]]
+ do
+ sleep 1
+ done
+ # no longer necessary; done at docker build time
+ # mysql -u root -p'Aa123456' -h $IP_ADDRESS < /opt/portal/deliveries/Apps_Users_OnBoarding_Script.sql
+ echo "yes" > /opt/config/boot.txt
+fi