From: eh552t <eh552t@intl.att.com>
Date: Thu, 31 Aug 2017 12:43:46 +0000 (+0200)
Subject: First changes for integration in clamp_vm_init
X-Git-Tag: 1.0.0-Amsterdam~185
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F83%2F9683%2F1;p=demo.git

First changes for integration in clamp_vm_init

Change-Id: If5d2c7875a36bd3a25a8f817ebfbcf54e0b40cf2
Signed-off-by: eh552t <eh552t@intl.att.com>
Issue-Id: CLAMP-47
---

diff --git a/boot/clamp_vm_init.sh b/boot/clamp_vm_init.sh
index 5d19da0c..abc01e15 100644
--- a/boot/clamp_vm_init.sh
+++ b/boot/clamp_vm_init.sh
@@ -3,10 +3,26 @@
 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)
-DMAAP_TOPIC=$(cat /opt/config/dmaap_topic.txt)
-OPENSTACK_USERNAME=$(cat /opt/config/openstack_username.txt)
-OPENSTACK_API_KEY=$(cat /opt/config/openstack_api_key.txt)
+DOCKER_IMAGE_VERSION=$(cat /opt/config/docker_version.txt)
 
 # Fetch the latest code/scripts
 cd /opt/clamp
 git pull
+
+# Remove unused folders as only extra/ folder is used for docker compose
+rm -rf pom.xml
+rm -rf src/
+
+# No configuration change here as directly done in the CLAMP repo
+
+# Pull the clamp docker image from nexus and tag it
+# Maria db will be pulled automatically from docker.io during docker-compose
+docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO
+
+docker pull $NEXUS_DOCKER_REPO/onap/clamp:$DOCKER_IMAGE_VERSION
+docker tag $NEXUS_DOCKER_REPO/onap/clamp:$DOCKER_IMAGE_VERSION onap/clamp:latest
+
+cd extra/docker/clamp/
+
+# Start Clamp and MariaDB containers with docker compose and clamp/extra/docker/clamp/docker-compose.yml
+/opt/docker/docker-compose up -d