X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fdocker%2Fdrun.sh;h=a8f0393675843a1c273fae9a45e06593411436d3;hb=1e3be601c78fa851333e51c6498713d1c412bd62;hp=2eb025eab0b35fe41965c96a5df61e948c4f6943;hpb=a05704fd1bd8b620c96a13004876e82f73e72af7;p=aaf%2Fauthz.git

diff --git a/auth/docker/drun.sh b/auth/docker/drun.sh
index 2eb025ea..a8f03936 100644
--- a/auth/docker/drun.sh
+++ b/auth/docker/drun.sh
@@ -20,6 +20,8 @@ fi
 
 . ./cass.props
 
+bash aaf.sh onap
+
 if [ "$1" == "" ]; then
     AAF_COMPONENTS=$(cat components)
 else
@@ -57,13 +59,29 @@ for AAF_COMPONENT in ${AAF_COMPONENTS}; do
 
     echo Starting aaf_$AAF_COMPONENT...
 
+    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"
+       for SA in service locate oauth gui fs cm hello; do
+         ADD_HOST="$ADD_HOST --add-host=$SA.$A:$HOST_IP"
+       done
+    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' \
         ${PREFIX}${ORG}/${PROJECT}/aaf_${AAF_COMPONENT}:${VERSION}