X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fdocker%2Fdrun.sh;h=994bb556cc6ae6e91dc1e7fe667293debdd441bd;hb=2b46f76d9a688acf326424659ec9672a2614fdcf;hp=45b5893f21effd0e476b858e096e08eca93a45f6;hpb=377ea9acbc78bcd54ceb898b64cfaf2923fd8be4;p=aaf%2Fauthz.git

diff --git a/auth/docker/drun.sh b/auth/docker/drun.sh
index 45b5893f..994bb556 100644
--- a/auth/docker/drun.sh
+++ b/auth/docker/drun.sh
@@ -1,29 +1,32 @@
 #!/bin/bash
+#########
+#  ============LICENSE_START====================================================
+#  org.onap.aaf
+#  ===========================================================================
+#  Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
+#  ===========================================================================
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+#  ============LICENSE_END====================================================
+#
 # 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
+CASSANDRA_CLUSTER=${CASSANDRA_CLUSTER:=$CASSANDRA_DOCKER}
 
 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
+# Running without params keeps from being TTY
+bash ./aaf.sh 
 
 if [ "$1" == "" ]; then
     AAF_COMPONENTS=$(cat components)
@@ -32,58 +35,86 @@ else
 fi
 
 for AAF_COMPONENT in ${AAF_COMPONENTS}; do
+    LINKS=""
+    CMD_LINE=""
+    PUBLISH=""
     case "$AAF_COMPONENT" in
     "service")
-        PORTMAP="8100:8100"
-        LINKS="--link aaf_cass:cassandra --add-host=$CASS_HOST"
+        PUBLISH="--publish 8100:8100"
+        if [ -z "$CASSANDRA_DOCKER" ]; then
+	  CMD_LINE="cd /opt/app/aaf && /bin/bash bin/pod_wait.sh aaf-service && exec bin/service"
+        else
+	  CMD_LINE="cd /opt/app/aaf && /bin/bash bin/pod_wait.sh aaf-service aaf-cass && exec bin/service"
+          LINKS="--link $CASSANDRA_DOCKER"
+	  echo $CASSANDRA_CLUSTER
+        fi
         ;;
     "locate")
-        PORTMAP="8095:8095"
-        LINKS="--link aaf_cass:cassandra --add-host=$CASS_HOST"
+        PUBLISH="--publish 8095:8095"
+        LINKS="--link aaf-cass --link aaf-service"
+	CMD_LINE="cd /opt/app/aaf && /bin/bash bin/pod_wait.sh aaf-locate aaf-service && exec bin/locate"
         ;;
     "oauth")
-        PORTMAP="8140:8140"
-        LINKS="--link aaf_cass:cassandra --add-host=$CASS_HOST"
-        ;;
-    "gui")
-        PORTMAP="8200:8200"
+        PUBLISH="--publish 8140:8140"
+        LINKS="--link aaf-cass --link aaf-service --link aaf-locate"
+	CMD_LINE="cd /opt/app/aaf && /bin/bash bin/pod_wait.sh aaf-oauth aaf-service && exec bin/oauth"
         ;;
     "cm")
-        PORTMAP="8150:8150"
-        LINKS="--link aaf_cass:cassandra "
-        LINKS="--link aaf_cass:cassandra --add-host=$CASS_HOST"
+        PUBLISH="--publish 8150:8150"
+        LINKS="--link aaf-cass --link aaf-service --link aaf-locate"
+	CMD_LINE="cd /opt/app/aaf && /bin/bash bin/pod_wait.sh aaf-cm aaf-locate && exec bin/cm"
         ;;
-    "hello")
-        PORTMAP="8130:8130"
+    "gui")
+        PUBLISH="--publish 8200:8200"
+        LINKS="--link aaf-service --link aaf-locate --link aaf-oauth --link aaf-cm"
+	CMD_LINE="cd /opt/app/aaf && /bin/bash bin/pod_wait.sh aaf-gui aaf-locate && exec bin/gui"
         ;;
     "fs")
-        PORTMAP="80:8096"
+        PUBLISH="--publish 80:8096"
+        LINKS="--link aaf-locate"
+	CMD_LINE="cd /opt/app/aaf && /bin/bash bin/pod_wait.sh aaf-fs aaf-locate && exec bin/fs"
+        ;;
+    "hello")
+        PUBLISH="--publish 8130:8130"
+        LINKS="--link aaf-service --link aaf-locate --link aaf-oauth --link aaf-cm"
+	CMD_LINE="cd /opt/app/aaf && /bin/bash bin/pod_wait.sh aaf-hello aaf-locate && exec bin/hello"
         ;;
     esac
 
-    echo Starting aaf_$AAF_COMPONENT...
+    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"
-    done
+    #for A in aaf.osaaf.org $AH_ROOT; do 
+       #ADD_HOST="$ADD_HOST --add-host=$A:$HOST_IP"
+    #done
 
-    $DOCKER run \
+    #if [ ! -z "$LINKS" ] && [[ "$CASS_HOST" =~ ":" ]]; then
+       #ADD_HOST="$ADD_HOST --add-host=$CASS_HOST"
+    #fi
+    #--hostname="${AAF_COMPONENT}.${NAMESPACE}" \
+    #    --env aaf_locate_url=https://aaf-locate:8095 \
+    #	$ADD_HOST \
+    if [ -n "${DUSER}" ]; then
+       THE_USER="--user $DUSER"
+    fi
+    $DOCKER run  \
         -d \
-        --name aaf_$AAF_COMPONENT \
-        --hostname="${AAF_COMPONENT}.aaf.osaaf.org" \
-	$ADD_HOST \
+        ${THE_USER} \
+        --name aaf-$AAF_COMPONENT \
         ${LINKS} \
         --env AAF_ENV=${AAF_ENV} \
-        --env AAF_REGISTER_AS=${AAF_REGISTER_AS} \
+        --env aaf_locator_container=docker \
+        --env aaf_locator_container_ns=${NAMESPACE} \
+        --env aaf_locator_fqdn=${HOSTNAME} \
+        --env aaf_locator_public_hostname=${HOSTNAME} \
         --env LATITUDE=${LATITUDE} \
         --env LONGITUDE=${LONGITUDE} \
-        --publish $PORTMAP \
+        --env CASSANDRA_CLUSTER=${CASSANDRA_CLUSTER} \
+        --env CASSANDRA_USER=${CASSANDRA_USER} \
+        --env CASSANDRA_PASSWORD=${CASSANDRA_PASSWORD} \
+        --env CASSANDRA_PORT=${CASSANDRA_PORT} \
+        $PUBLISH \
         -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} \
+	/bin/bash -c "$CMD_LINE"
 done