ensure Cass Phase2 on starts

[aaf/authz.git] / auth / auth-cass / docker / dinstall.sh

diff --git a/auth/auth-cass/docker/dinstall.sh b/auth/auth-cass/docker/dinstall.sh
index c3e07d5..86976a0 100644 (file)
--- a/auth/auth-cass/docker/dinstall.sh
+++ b/auth/auth-cass/docker/dinstall.sh
@@ -1,13 +1,36 @@
 #!/bin/bash 
+
 if [ "`docker ps -a | grep aaf_cass`" == "" ]; then
   docker run --name aaf_cass  -d cassandra:3.11
+  echo "aaf_cass Starting"
   echo "Check for running Docker Container aaf_cass, then run again."
+  # we have to exit here so that the calling script can load CQL files
   exit
 else
-  docker exec aaf_cass mkdir -p /opt/app/cass_init
-  docker cp "../src/main/cql/." aaf_cass:/opt/app/cass_init
+  for CNT in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15; do
+     if [ "`docker container logs aaf_cass | grep 'listening for CQL clients'`" == "" ]; then
+               echo "Sleep 10"
+        sleep 10
+     else 
+               YESCQL="yes"
+       break
+     fi
+  done
 fi 
 
+if [ "$YESCQL" == "" ]; then
+  echo "CQL Never started... exiting"
+  exit
+fi
+
+echo "Creating /opt/app/cass_init dir on aaf_cass"
+docker exec aaf_cass mkdir -p /opt/app/cass_init
+echo "cp the following files to /opt/app/cass_init dir on aaf_cass"
+ls ../src/main/cql
+docker cp "../src/main/cql/." aaf_cass:/opt/app/cass_init
+echo "The following files are on /opt/app/cass_init dir on aaf_cass"
+docker exec -it aaf_cass 'ls /opt/app/cass_init'
+
 
 echo "Docker Installed Basic Cassandra on aaf_cass.  Executing the following "
 echo "NOTE: This creator provided is only a Single Instance. For more complex Cassandra, create independently"
@@ -19,8 +42,9 @@ echo " cqlsh -u root -p root -f osaaf.cql"
 echo ""
 echo "The following will give you a temporary identity with which to start working, or emergency"
 echo " cqlsh -u root -p root -f temp_identity.cql"
-echo "Sleeping for 10 seconds"
-sleep 10
+echo "Sleeping for 20 seconds"
+
+echo "Create Keyspaces and Tables"
 docker exec -it aaf_cass bash -c '\
 cd /opt/app/cass_init; \
 echo "Creating Keyspace";cqlsh -u root -p root -f keyspace.cql;\