X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fauth-cass%2Fdocker%2Fdinstall.sh;h=3e5098c0a82acf4edfc26444fe946d4f1958cb27;hb=014494d662fee62eb0911b693aa6baf0ba54e26f;hp=f0c419408c59c097dd206d30c7768089a26686be;hpb=c486733c0160bfb16bb75a008abe4e6a2616cb44;p=aaf%2Fauthz.git

diff --git a/auth/auth-cass/docker/dinstall.sh b/auth/auth-cass/docker/dinstall.sh
index f0c41940..3e5098c0 100644
--- a/auth/auth-cass/docker/dinstall.sh
+++ b/auth/auth-cass/docker/dinstall.sh
@@ -1,50 +1,19 @@
 #!/bin/bash 
+#
+# This is only called from HEAT, as it needs a single check and wait for Cassandra to be ready
+#
+. drun.sh $@
 
-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
-  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 
+echo "Waiting for Cass to be initialized"
+for I in 1 2 3 4 5 6 7 8 9 10 11 12 13 14; do
+  $DOCKER exec -it aaf_cass bash aaf_cmd wait 2> /dev/null
+  if [ "$?" -ne "0" ]; then
+    echo "Container not ready... Sleep 10"
+    sleep 10
+  else
+    echo "aaf_cass is ready"
+    break
+  fi 
+done
 
-if [ "$YESCQL" == "" ]; then
-  echo "CQL Never started... exiting"
-  exit
-fi
 
-docker exec aaf_cass mkdir -p /opt/app/cass_init
-docker cp "../src/main/cql/." aaf_cass:/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"
-echo ""
-echo " cd /opt/app/cass_init"  
-echo " cqlsh -u root -p root -f keyspace.cql"
-echo " cqlsh -u root -p root -f init.cql"
-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 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;\
-echo "Creating init";cqlsh -u root -p root -f init.cql;\
-echo "Creating osaaf";cqlsh -u root -p root -f osaaf.cql;\
-echo "Creating temp Identity";cqlsh -u root -p root -f temp_identity.cql'
-
-echo "Inspecting aafcassadra.  Use to get the IP address to update org.osaaf.cassandra.props"
-docker inspect aaf_cass | grep '"IPAddress' | head -1