X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fauth-cass%2Fcass_init%2Fcmd.sh;h=ec8cf6b7dbcbe0419d3b688eb731c12d88f1f900;hb=a93911399b464aba33c072eb0a994e50a6691b7e;hp=b3d5292c893e4b0e19c08f72b1f6697419a30879;hpb=235dd9ad5309cb8c348e15c66fb3884d39dbb107;p=aaf%2Fauthz.git

diff --git a/auth/auth-cass/cass_init/cmd.sh b/auth/auth-cass/cass_init/cmd.sh
index b3d5292c..ec8cf6b7 100644
--- a/auth/auth-cass/cass_init/cmd.sh
+++ b/auth/auth-cass/cass_init/cmd.sh
@@ -9,11 +9,14 @@ if [ ! -e /aaf_cmd ]; then
   chmod u+x /aaf_cmd
 fi
 
+# Always need startup status...
+if [ ! -e "$DIR" ]; then
+  mkdir -p "$DIR"
+fi
+
 function status {
-  if [ -d "$DIR" ]; then
      echo "$@"
      echo "$@" > $DIR/aaf_cass
-  fi
 }
 
 function wait_start {
@@ -29,6 +32,7 @@ function wait_start {
     done
 }
 
+
 function wait_cql {
    status wait for keyspace to be initialized
    for CNT in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15; do
@@ -41,6 +45,19 @@ function wait_cql {
     done
 }
 
+function wait_ready {
+   status wait for cassandra to be fully ready
+   for CNT in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15; do
+       STATUS="$(cat $DIR/aaf_cass)"
+       if [ "$STATUS" = "ready" ]; then
+	break
+     else
+        echo "Waiting for Start, $STATUS... Sleep 10"
+        sleep 10
+      fi
+    done
+}
+
 function install_cql {
     wait_start started   
     # Now, make sure data exists
@@ -68,50 +85,14 @@ function 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")
-  	    echo $DATE
-            CRED="/opt/app/aaf/cass_init/dats/cred.dat"
-            # Enter for People
-            echo "Default Passwords for Apps"
-            for ID in $(grep '|a|' $ID_FILE | sed -e "s/|.*//"); do
-               if [ "$ID" = "aaf" ]; then
-                  DOMAIN="aaf.osaaf.org";
-               else
-                  DOMAIN="$ID.onap.org";
-               fi
-               unset FIRST
-               for D in ${DOMAIN//./ }; do
-                  if [ -z "$FIRST" ]; then
-                    NS="$D"
-                    FIRST="N"
-                  else
-                    NS="$D.$NS"
-                  fi
-               done
-               echo "$ID@$DOMAIN|2|${DATE}|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|$NS|53344|" >> $CRED
-            done
-  	    
-	    # Enter for People
-            for ID in $(grep '|e|' $ID_FILE | sed -e "s/|.*//"); do
-               echo "$ID@people.osaaf.org|2|${DATE}|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.osaaf.people|53344|" >> $CRED
-            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
-      status Pushing data to cassandra
-      bash push.sh
+    echo " cd /opt/app/aaf/cass_init"
+    cd /opt/app/aaf/cass_init
+    install_cql initialized
+    status prep data for bootstrapping
+    bash prep.sh
+    status push data to cassandra
+    bash push.sh
+    cd -
     status ready
 }
 
@@ -126,13 +107,8 @@ case "$1" in
   ;;
   wait)
     # Wait for initialization.  This can be called from Docker only as a check to make sure it is ready
-    wait_start started 
+    wait_ready 
 
-    # Make sure Keyspace is loaded
-    wait_cql 
-
-    # Wait for Data load?
-    status ready
   ;;
   onap)
     # start install_onap (which calls install_cql first) in background, waiting for process to start