X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fauth-cass%2Fcass_init%2Fcmd.sh;h=09379730e49ee5142347ee2d983e2c968853c195;hb=08e93406376e318c8e935716403d2366c8402bb8;hp=056faed7b50c4d87f509224855ea9e6b49ab0665;hpb=aebee0032fe3d636f5c077df7bb5ee705bb38c44;p=aaf%2Fauthz.git

diff --git a/auth/auth-cass/cass_init/cmd.sh b/auth/auth-cass/cass_init/cmd.sh
index 056faed7..09379730 100644
--- a/auth/auth-cass/cass_init/cmd.sh
+++ b/auth/auth-cass/cass_init/cmd.sh
@@ -2,12 +2,24 @@
 #
 # Engage normal Cass Init, then check for data installation
 #
+DIR="/opt/app/aaf/status"
+
 if [ ! -e /aaf_cmd ]; then
   ln -s /opt/app/aaf/cass_init/cmd.sh /aaf_cmd
   chmod u+x /aaf_cmd
 fi
 
+function status {
+  if [ -d "$DIR" ]; then
+     echo "$@"
+     echo "$@" > $DIR/aaf_cass
+  fi
+}
+
 function install_cql {
+    status install 
+    sleep 10
+    status wait for cassandra to start
     # Now, make sure data exists
     if [ "$(/usr/bin/cqlsh -e 'describe keyspaces' | grep authz)" = "" ]; then
       for CNT in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15; do
@@ -27,25 +39,23 @@ function install_cql {
         cd /opt/app/aaf/cass_init
         echo " cqlsh -f keyspace.cql"
         /usr/bin/cqlsh -f keyspace.cql
+	status keyspace installed
         echo " cqlsh -f init.cql"
         /usr/bin/cqlsh -f init.cql
+	status data initialized
         echo ""
         echo "The following will give you a temporary identity with which to start working, or emergency"
         echo " cqlsh -f temp_identity.cql"
       fi
     fi
+    status $1
 }
 
-case "$1" in
-  start)
-    # Startup like normal
-    echo "Cassandra Startup"
-    /usr/local/bin/docker-entrypoint.sh 
-  ;;
-  onap)
-	install_cql
+function install_onap {
+	install_cql initialized
 
 	# Change date expiring dat files to more recent
+	status Creating ONAP Identities
 	ID_FILE=/opt/app/aaf/cass_init/sample.identities.dat	
     	if [ -e $ID_FILE ]; then
   	    DATE=$(date "+%Y-%m-%d %H:%M:%S.000+0000" -d "+6 months")
@@ -77,13 +87,34 @@ case "$1" in
             done
 
 	    # Change UserRole
+	    status Setting up User Roles
             mv dats/user_role.dat tmp
             sed "s/\(^.*|\)\(.*|\)\(.*|\)\(.*\)/\1${DATE}|\3\4/" tmp > dats/user_role.dat
 
 	    # Remove ID File, which is marker for initializing Creds
             rm $ID_FILE
         fi
-	bash push.sh
+      status Pushing data to cassandra
+      bash push.sh
+    status ready
+}
+
+case "$1" in
+  start)
+    # start install_cql in background, waiting for process to start
+    install_cql ready &
+
+    # Startup like normal
+    echo "Cassandra Startup"
+    /usr/local/bin/docker-entrypoint.sh 
+  ;;
+  onap)
+    # start install_onap (which calls install_cql first) in background, waiting for process to start
+    install_onap &
+
+    # Startup like normal
+    echo "Cassandra Startup"
+    /usr/local/bin/docker-entrypoint.sh 
   ;;
 esac