No TTY in aaf.sh from drun.sh

[aaf/authz.git] / auth / docker / drun.sh

diff --git a/auth/docker/drun.sh b/auth/docker/drun.sh
index c6914a0..358e923 100644 (file)
--- a/auth/docker/drun.sh
+++ b/auth/docker/drun.sh
@@ -1,29 +1,31 @@
 #!/bin/bash
-# Pull in Variables from d.props
-. ./d.props
-
-# Only need Cassandra Link Info when initializing the container.
-if [ ! -e ./cass.props ]; then
-    cp cass.props.init cass.props
-fi
-. ./cass.props
+# Validate for realtime Cassandra info
 
-DOCKER=${DOCKER:=docker}
+# 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
 
-CASS_IS_SET="$(grep '<Cass IP>' cass.props)"
-if [ -n "$CASS_IS_SET" ]; then
-    CASS_IP="$($DOCKER container inspect aaf_cass | grep \"IPAddress\": -m 1 | cut -d '"' -f 4)"
-    if [ -n "$CASS_IP" ]; then
-      sed -i -e "s/\(^.*:\).*/\1$CASS_IP/" cass.props
-    else
-      echo "Set CASSASNDRA IP in cass.props"
-      exit
-    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
 
-. ./cass.props
+# 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)
@@ -72,6 +74,10 @@ for AAF_COMPONENT in ${AAF_COMPONENTS}; do
        ADD_HOST="$ADD_HOST --add-host=$A:$HOST_IP"
     done
 
+    if [[ "$CASS_HOST" =~ ":" ]]; then
+       echo "Adding Cassandra Host $CASS_HOST"
+       ADD_HOST="$ADD_HOST --add-host=$CASS_HOST"
+    fi
     $DOCKER run \
         -d \
         --name aaf_$AAF_COMPONENT \
@@ -82,6 +88,11 @@ for AAF_COMPONENT in ${AAF_COMPONENTS}; do
         --env AAF_REGISTER_AS=${AAF_REGISTER_AS} \
         --env LATITUDE=${LATITUDE} \
         --env LONGITUDE=${LONGITUDE} \
+        --env CASS_HOST=${CASS_HOST} \
+        --env CASSANDRA_CLUSTER=${CASSANDRA_CLUSTER} \
+        --env CASSANDRA_USER=${CASSANDRA_USER} \
+        --env CASSANDRA_PASSWORD=${CASSANDRA_PASSWORD} \
+        --env CASSANDRA_PORT=${CASSANDRA_PORT} \
         --publish $PORTMAP \
         -v "aaf_config:$CONF_ROOT_DIR" \
         ${PREFIX}${ORG}/${PROJECT}/aaf_${AAF_COMPONENT}:${VERSION}