modify Cass Install on vm_init2

[demo.git] / boot / aaf_vm_init.sh

diff --git a/boot/aaf_vm_init.sh b/boot/aaf_vm_init.sh
index 7c91ade..096bdac 100644 (file)
--- a/boot/aaf_vm_init.sh
+++ b/boot/aaf_vm_init.sh
@@ -14,24 +14,14 @@ cd /opt/authz
 git pull
 
 
+cd /opt/authz/auth/auth-cass/docker
 if [ "`docker container ls | grep aaf_cass`" = "" ]; then
   # Cassandra Install
-  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