X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fauth-cass%2Fdocker%2Fdinstall.sh;h=ec82d8af4e00fe64f811d80796e9bb3b40f540eb;hb=1e3be601c78fa851333e51c6498713d1c412bd62;hp=d6fcb9f94b0574ef1b930f7387cbf136db540d1f;hpb=3aca33c5bb9af1ba4df574ceb90435f54d14ccf5;p=aaf%2Fauthz.git

diff --git a/auth/auth-cass/docker/dinstall.sh b/auth/auth-cass/docker/dinstall.sh
index d6fcb9f9..ec82d8af 100644
--- a/auth/auth-cass/docker/dinstall.sh
+++ b/auth/auth-cass/docker/dinstall.sh
@@ -1,72 +1,19 @@
 #!/bin/bash 
-if [ -e /usr/bin/docker ]; then 
-  DOCKER=/usr/bin/docker
-elif [ -e /usr/local/bin/docker ]; then
-  DOCKER=/usr/local/bin/docker
-else
-  echo Docker not available in /usr/bin or /usr/local/bin
-  exit
-fi
+#
+# This is only called from HEAT, as it needs a single check and wait for Cassandra to be ready
+#
+. drun.sh
+
+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 [ "$($DOCKER volume ls | grep aaf_cass_data)" = "" ]; then
-  $DOCKER volume create aaf_cass_data
-  echo "Created Cassandra Volume aaf_cass_data"
-fi
 
-echo "Running DInstall"
-if [ "`$DOCKER ps -a | grep aaf_cass`" == "" ]; then
-  echo "starting Cass from 'run'"
-  # NOTE: These HEAP Sizes are minimal. Not set for full organizations.
-  $DOCKER run \
-    --name aaf_cass \
-    -e HEAP_NEWSIZE=512M \
-    -e MAX_HEAP_SIZE=1024M \
-    -e CASSANDRA_DC=dc1 \
-    -e CASSANDRA_CLUSTER_NAME=osaaf \
-    --mount 'type=volume,src=aaf_cass_data,dst=/var/lib/cassandra,volume-driver=local' \
-    -d cassandra:3.11 
-  # Set on local Disk
-  # -v /opt/app/cass:/var/lib/cassandra 
-  echo "aaf_cass Starting"
-  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 
-     	break
-     fi
-  done
-  
-  echo "Running Phase 2 DInstall"
-  $DOCKER container ps
-  
-  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 aaf_cass ls /opt/app/cass_init
-  
-  if [ "`$DOCKER exec aaf_cass /usr/bin/cqlsh -e 'describe keyspaces' | grep authz`" == "" ]; then
-    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 -f keyspace.cql"
-    echo " cqlsh -f init.cql"
-    echo " cqlsh -f osaaf.cql"
-    echo " cqlsh -f temp_identity.cql"
-    echo ""
-    echo "The following will give you a temporary identity with which to start working, or emergency"
-    echo " cqlsh -f temp_identity.cql"
-    echo "Create Keyspaces and Tables"
-    $DOCKER exec aaf_cass bash /usr/bin/cqlsh -f /opt/app/cass_init/keyspace.cql
-    $DOCKER exec aaf_cass bash /usr/bin/cqlsh -e 'describe keyspaces'
-    $DOCKER exec aaf_cass bash /usr/bin/cqlsh -f /opt/app/cass_init/init.cql
-    $DOCKER exec aaf_cass bash /usr/bin/cqlsh -f /opt/app/cass_init/osaaf.cql
-    $DOCKER exec aaf_cass bash /usr/bin/cqlsh -f /opt/app/cass_init/temp_identity.cql
-  fi
-else 
-  $DOCKER start aaf_cass
-fi