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

diff --git a/auth/docker/drun.sh b/auth/docker/drun.sh
index 994bb556..86fe5984 100644
--- a/auth/docker/drun.sh
+++ b/auth/docker/drun.sh
@@ -34,6 +34,14 @@ else
     AAF_COMPONENTS="$@"
 fi
 
+# All the NORMAL services use common directory
+#  remove this for Hello, which we want non shared
+CONFIG="-v aaf_config:$CONF_ROOT_DIR"
+if [ -n "${DUSER}" ]; then
+  THE_USER="--user $DUSER"
+fi
+IMAGE="${PREFIX}${ORG}/${PROJECT}/aaf_core:${VERSION}"
+
 for AAF_COMPONENT in ${AAF_COMPONENTS}; do
     LINKS=""
     CMD_LINE=""
@@ -61,7 +69,7 @@ for AAF_COMPONENT in ${AAF_COMPONENTS}; do
         ;;
     "cm")
         PUBLISH="--publish 8150:8150"
-        LINKS="--link aaf-cass --link aaf-service --link aaf-locate"
+        LINKS="--link aaf-cass --link aaf-service --link aaf-locate --link aaf-oauth"
 	CMD_LINE="cd /opt/app/aaf && /bin/bash bin/pod_wait.sh aaf-cm aaf-locate && exec bin/cm"
         ;;
     "gui")
@@ -75,27 +83,41 @@ for AAF_COMPONENT in ${AAF_COMPONENTS}; do
 	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"
+	CONFIG="-v aaf_hello_config:/opt/app/osaaf/local"
+
+	# Since Helm based element have init-containers, take the same approach here.
+        if [ -z "$(docker volume ls | grep aaf_hello_config)" ]; then
+            echo Init Hello Config Container
+
+  	    echo -n "Creating Volume: "
+            $DOCKER volume create -d local aaf_hello_config
+
+	    $DOCKER run --rm --name aaf_hello_config ${LINKS} \
+		$CONFIG \
+		--env AAF_FQDN=$HOSTNAME \
+		--env DEPLOY_FQI=deployer@people.osaaf.org \
+		--env DEPLOY_PASSWORD=demo123456! \
+		--env APP_FQI=aaf@aaf.osaaf.org \
+		--env APP_FQDN=aaf-hello \
+		--env LATITUDE=$LATITUDE \
+		--env LONGITUDE=$LONGITUDE \
+    		--env aaf_locator_container_ns=onap \
+    		--env aaf_locator_container=docker \
+		$LINKS \
+	        "${PREFIX}${ORG}/${PROJECT}/aaf_agent:${VERSION}" \
+ 		bash -c "bash /opt/app/aaf_config/bin/agent.sh && chown -R ${DUSER}:${DUSER} /opt/app/osaaf/local"
+	fi
+
+        PUBLISH="--publish 8130:8130"
+	#CMD_LINE="cd /opt/app/aaf && /bin/bash bin/pod_wait.sh aaf-hello aaf-locate aaf-cm && sleep 240"
+	CMD_LINE="cd /opt/app/aaf && /bin/bash bin/pod_wait.sh aaf-hello aaf-locate aaf-cm && exec bin/hello"
+	IMAGE="${PREFIX}${ORG}/${PROJECT}/aaf_hello:${VERSION}"
         ;;
     esac
 
     echo Starting aaf-$AAF_COMPONENT...
 
-    #for A in aaf.osaaf.org $AH_ROOT; do 
-       #ADD_HOST="$ADD_HOST --add-host=$A:$HOST_IP"
-    #done
-
-    #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 \
         ${THE_USER} \
@@ -105,16 +127,18 @@ for AAF_COMPONENT in ${AAF_COMPONENTS}; do
         --env aaf_locator_container=docker \
         --env aaf_locator_container_ns=${NAMESPACE} \
         --env aaf_locator_fqdn=${HOSTNAME} \
-        --env aaf_locator_public_hostname=${HOSTNAME} \
+        --env aaf_locator_public_fqdn=${HOSTNAME} \
+        --env aaf_deployed_version=${VERSION} \
         --env LATITUDE=${LATITUDE} \
         --env LONGITUDE=${LONGITUDE} \
         --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" \
         -v "aaf_status:/opt/app/aaf/status" \
-        ${PREFIX}${ORG}/${PROJECT}/aaf_${AAF_COMPONENT}:${VERSION} \
+        $PUBLISH \
+	$CONFIG \
+	$IMAGE \
 	/bin/bash -c "$CMD_LINE"
+
 done