X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fdocker%2Fdrun.sh;h=c6914a09f2758f8722c4a077a1e9f48e515b738e;hb=93871ff58e90a91d359f72b00a92fe1e28310b82;hp=c62adfc29e48f7fd83ec7f5ea8fbd1695aa24f5e;hpb=4ad4763d8c9191998cc671a884d1af5da6ba8bb9;p=aaf%2Fauthz.git

diff --git a/auth/docker/drun.sh b/auth/docker/drun.sh
index c62adfc2..c6914a09 100644
--- a/auth/docker/drun.sh
+++ b/auth/docker/drun.sh
@@ -2,8 +2,31 @@
 # 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
+
+DOCKER=${DOCKER:=docker}
+
+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
+fi
+
+. ./cass.props
+
+bash aaf.sh onap
+
 if [ "$1" == "" ]; then
-    AAF_COMPONENTS=$(ls -r ../aaf_${VERSION}/bin | grep -v '\.')
+    AAF_COMPONENTS=$(cat components)
 else
     AAF_COMPONENTS="$@"
 fi
@@ -12,22 +35,22 @@ for AAF_COMPONENT in ${AAF_COMPONENTS}; do
     case "$AAF_COMPONENT" in
     "service")
         PORTMAP="8100:8100"
-        LINKS="--link aaf_cass:cassandra --add-host=$CASS_HOST"
+        LINKS="--link aaf_cass:cassandra "
         ;;
     "locate")
         PORTMAP="8095:8095"
-        LINKS="--link aaf_cass:cassandra --add-host=$CASS_HOST"
+        LINKS="--link aaf_cass:cassandra "
         ;;
     "oauth")
         PORTMAP="8140:8140"
-        LINKS="--link aaf_cass:cassandra --add-host=$CASS_HOST"
+        LINKS="--link aaf_cass:cassandra "
         ;;
     "gui")
         PORTMAP="8200:8200"
         ;;
     "cm")
         PORTMAP="8150:8150"
-        LINKS="--link aaf_cass:cassandra --add-host=$CASS_HOST"
+        LINKS="--link aaf_cass:cassandra "
         ;;
     "hello")
         PORTMAP="8130:8130"
@@ -39,14 +62,27 @@ for AAF_COMPONENT in ${AAF_COMPONENTS}; do
 
     echo Starting aaf_$AAF_COMPONENT...
 
-    docker run \
+    if [ -n "$AAF_REGISTER_AS" ] && [ "$HOSTNAME" != "$AAF_REGISTER_AS" ]; then
+       AH_ROOT="$HOSTNAME $AAF_REGISTER_AS"
+    else
+       AH_ROOT="$HOSTNAME"
+    fi
+
+    for A in aaf.osaaf.org $AH_ROOT; do 
+       ADD_HOST="$ADD_HOST --add-host=$A:$HOST_IP"
+    done
+
+    $DOCKER run \
         -d \
         --name aaf_$AAF_COMPONENT \
         --hostname="${AAF_COMPONENT}.aaf.osaaf.org" \
-        --add-host="$HOSTNAME:$HOST_IP" \
-        --add-host="aaf.osaaf.org:$HOST_IP" \
+	$ADD_HOST \
         ${LINKS} \
+        --env AAF_ENV=${AAF_ENV} \
+        --env AAF_REGISTER_AS=${AAF_REGISTER_AS} \
+        --env LATITUDE=${LATITUDE} \
+        --env LONGITUDE=${LONGITUDE} \
         --publish $PORTMAP \
-        --mount 'type=volume,src=aaf_config,dst='$CONF_ROOT_DIR',volume-driver=local' \
-        ${ORG}/${PROJECT}/aaf_${AAF_COMPONENT}:${VERSION}
+        -v "aaf_config:$CONF_ROOT_DIR" \
+        ${PREFIX}${ORG}/${PROJECT}/aaf_${AAF_COMPONENT}:${VERSION}
 done