From 1cbf57f33370386fcdfe3097d19aac899b44736b Mon Sep 17 00:00:00 2001
From: Instrumental <jonathan.gathman@att.com>
Date: Mon, 14 May 2018 14:37:59 -0500
Subject: [PATCH] Correct Docker calls

Issue-ID: AAF-282
Change-Id: I9d0498bd43ad890e432f805a2e86ea5ab0204d48
Signed-off-by: Instrumental <jonathan.gathman@att.com>
---
 auth/auth-cass/docker/dinstall.sh | 70 ++++++++++++++++++---------------------
 1 file changed, 33 insertions(+), 37 deletions(-)

diff --git a/auth/auth-cass/docker/dinstall.sh b/auth/auth-cass/docker/dinstall.sh
index 15b63483..8449fe17 100644
--- a/auth/auth-cass/docker/dinstall.sh
+++ b/auth/auth-cass/docker/dinstall.sh
@@ -1,7 +1,8 @@
 #!/bin/bash 
 DOCKER=/usr/bin/docker
-
+echo "Running DInstall"
 if [ "`$DOCKER ps -a | grep aaf_cass`" == "" ]; then
+  echo "starting Cass from 'run'"
   $DOCKER run --name aaf_cass  -d cassandra:3.11
   echo "aaf_cass Starting"
   for CNT in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15; do
@@ -12,39 +13,34 @@ if [ "`$DOCKER ps -a | grep aaf_cass`" == "" ]; then
      	break
      fi
   done
-  echo "Check for running Docker Container aaf_cass, then run again."
-  exit
-fi 
-
-sleep 20
-echo "Running containers"
-$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 -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"
-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 "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
+  
+  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
+  
+  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 ""
+  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_indentity.cql
+else 
+  $DOCKER start aaf_cass
+fi
-- 
2.16.6