Improve Docker start

For Docker style starts, pull in CASS_HOST info automatically

Issue-ID: AAF-603
Change-Id: Ia0b2e73eb34c29d028c7c1d3f9c19705e4176159
Signed-off-by: Instrumental <jonathan.gathman@att.com>

diff --git a/auth/docker/.gitignore b/auth/docker/.gitignore
index 8aa2685..d3c3ab6 100644 (file)
--- a/auth/docker/.gitignore
+++ b/auth/docker/.gitignore
@@ -1,5 +1,6 @@
 /local
 /d.props
+/d.props.bak
 /aaf.props
 /cass.props
 /policy*

diff --git a/auth/docker/drun.sh b/auth/docker/drun.sh
index ad1fb50..1b44236 100644 (file)
--- a/auth/docker/drun.sh
+++ b/auth/docker/drun.sh
@@ -1,4 +1,24 @@
 #!/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
 
@@ -53,6 +73,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 \