From: Instrumental <jonathan.gathman@att.com>
Date: Fri, 11 May 2018 19:04:12 +0000 (-0500)
Subject: modify Cass Install on vm_init
X-Git-Tag: v1.2.0~9
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=demo.git;a=commitdiff_plain;h=0836742d3e58946d3d0c85daddc4c02ba4e34927

modify Cass Install on vm_init

Issue-ID: AAF-282
Change-Id: I85f6c03b751b477304ecd177f33c3fd26b264ad6
Signed-off-by: Instrumental <jonathan.gathman@att.com>
---

diff --git a/boot/aaf_vm_init.sh b/boot/aaf_vm_init.sh
index 7c91ade7..30df3052 100644
--- a/boot/aaf_vm_init.sh
+++ b/boot/aaf_vm_init.sh
@@ -19,19 +19,9 @@ if [ "`docker container ls | grep aaf_cass`" = "" ]; then
   cd /opt/authz/auth/auth-cass/docker
   echo Phase 1 Cassandra Install
   ./dinstall.sh
-  for I in 1 2 3 4 5 6 7 8 9; do
-    echo "Waiting for Cassandra to startup"
-    sleep 20
-
-    if [ "`docker container ls | grep aaf_cass`" = "" ]; then
-        echo "Still waiting ..."
-    else
-        echo "Phase 2 Cassandra Instail"
-        ./dinstall.sh
-        break
-    fi
-  done
 fi
+echo "Phase 2 Cassandra Install"
+./dinstall.sh
 
 CASS_IP=`docker inspect aaf_cass | grep '"IPAddress' | head -1 | cut -d '"' -f 4`
 CASS_HOST="cass.aaf.osaaf.org:"$CASS_IP