X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fdocker%2Fdrun.sh;h=f5756b8162463bde2d24b0cf73e2e810d91340f3;hb=ca788dc542830b054f0a46df2dfd774fc318872c;hp=ad1fb5042989411ddc213add3597d11bc7832dfc;hpb=eb1a7439bbbd282fe2ff4f76a82a7f337323996e;p=aaf%2Fauthz.git

diff --git a/auth/docker/drun.sh b/auth/docker/drun.sh
index ad1fb504..f5756b81 100644
--- a/auth/docker/drun.sh
+++ b/auth/docker/drun.sh
@@ -1,10 +1,31 @@
 #!/bin/bash
+# Validate for realtime Cassandra info
+
+# check if outside Cluster defined... otherwise, set CASS_HOST for using expected Docker based Cass
+if [ -z "$(grep -e '^CASS_CLUSTER=.*' d.props)" ]; then
+  if [ "$(uname)" = "Darwin" ]; then
+    SED="sed -i .bak"
+  else
+    SED="sed -i"
+  fi
+
+  CASSANDRA_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' aaf_cass)
+  if [ -z "$(grep -e '^CASS_HOST.*' d.props)" ]; then
+    $SED "s/# CASS_HOST=.*/CASS_HOST=cass.aaf.osaaf.org:$CASSANDRA_IP/"  d.props
+  else 
+    $SED "s/CASS_HOST=.*/CASS_HOST=cass.aaf.osaaf.org:$CASSANDRA_IP/"  d.props
+  fi
+  echo "Updated d.props for CASSANDRA Name/IP"
+  grep -e '^CASS_HOST.*' d.props
+fi
+
 # Pull in Variables from d.props
 . ./d.props
 
 DOCKER=${DOCKER:=docker}
 
-bash aaf.sh onap
+# Running without params keeps from being TTY
+bash ./aaf.sh 
 
 if [ "$1" == "" ]; then
     AAF_COMPONENTS=$(cat components)
@@ -13,31 +34,49 @@ else
 fi
 
 for AAF_COMPONENT in ${AAF_COMPONENTS}; do
+    LINKS=""
+    CMD_LINE=""
+    PORTMAP=""
     case "$AAF_COMPONENT" in
     "service")
         PORTMAP="8100:8100"
         LINKS="--link aaf_cass:cassandra "
+        # CASS_HOST is for Container based Cassadra
+        if [ -z "$CASS_HOST" ]; then
+	  CMD_LINE="/bin/bash /opt/app/aaf/pod/pod_wait.sh aaf_service sleep 0 cd /opt/app/aaf;bin/service"
+        else
+	  CMD_LINE="/bin/bash /opt/app/aaf/pod/pod_wait.sh aaf_service aaf_cass cd /opt/app/aaf;bin/service"
+        fi
         ;;
     "locate")
         PORTMAP="8095:8095"
         LINKS="--link aaf_cass:cassandra "
+	CMD_LINE="/bin/bash /opt/app/aaf/pod/pod_wait.sh aaf_locate aaf_service cd /opt/app/aaf;bin/locate"
         ;;
     "oauth")
         PORTMAP="8140:8140"
         LINKS="--link aaf_cass:cassandra "
+	CMD_LINE="/bin/bash /opt/app/aaf/pod/pod_wait.sh aaf_oauth aaf_service cd /opt/app/aaf;bin/oauth"
         ;;
     "gui")
         PORTMAP="8200:8200"
+        LINKS=""
+	CMD_LINE="/bin/bash /opt/app/aaf/pod/pod_wait.sh aaf_gui aaf_locate cd /opt/app/aaf;bin/gui"
         ;;
     "cm")
         PORTMAP="8150:8150"
         LINKS="--link aaf_cass:cassandra "
+	CMD_LINE="/bin/bash /opt/app/aaf/pod/pod_wait.sh aaf_cm aaf_locate cd /opt/app/aaf;bin/cm"
         ;;
     "hello")
         PORTMAP="8130:8130"
+        LINKS=""
+	CMD_LINE="/bin/bash /opt/app/aaf/pod/pod_wait.sh aaf_hello aaf_locate cd /opt/app/aaf;bin/hello"
         ;;
     "fs")
         PORTMAP="80:8096"
+        LINKS=""
+	CMD_LINE="/bin/bash /opt/app/aaf/pod/pod_wait.sh aaf_fs aaf_locate cd /opt/app/aaf;bin/fs"
         ;;
     esac
 
@@ -53,6 +92,9 @@ for AAF_COMPONENT in ${AAF_COMPONENTS}; do
        ADD_HOST="$ADD_HOST --add-host=$A:$HOST_IP"
     done
 
+    if [ ! -z "$LINKS" ] && [[ "$CASS_HOST" =~ ":" ]]; then
+       ADD_HOST="$ADD_HOST --add-host=$CASS_HOST"
+    fi
     $DOCKER run \
         -d \
         --name aaf_$AAF_COMPONENT \
@@ -70,5 +112,7 @@ for AAF_COMPONENT in ${AAF_COMPONENTS}; do
         --env CASSANDRA_PORT=${CASSANDRA_PORT} \
         --publish $PORTMAP \
         -v "aaf_config:$CONF_ROOT_DIR" \
-        ${PREFIX}${ORG}/${PROJECT}/aaf_${AAF_COMPONENT}:${VERSION}
+        -v "aaf_status:/opt/app/aaf/status" \
+        ${PREFIX}${ORG}/${PROJECT}/aaf_${AAF_COMPONENT}:${VERSION} \
+	$CMD_LINE
 done