X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fdocker%2Faaf.sh;h=d0393d0afcb8aa70e0b1e38639b1249bd4737d01;hb=HEAD;hp=6ba8631db641c7d1c99cfe48166e464985c41838;hpb=ca788dc542830b054f0a46df2dfd774fc318872c;p=aaf%2Fauthz.git

diff --git a/auth/docker/aaf.sh b/auth/docker/aaf.sh
index 6ba8631d..d0393d0a 100644
--- a/auth/docker/aaf.sh
+++ b/auth/docker/aaf.sh
@@ -1,37 +1,76 @@
 #!/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====================================================
+#
+
 . ./d.props
 
-DOCKER=${DOCKER:=docker}
+DOCKER=${DOCKER:-docker}
+if [ "$DOCKER" = "podman" ]; then
+  PODNAME=${PODNAME:-$HOSTNAME}
+  if $(podman pod exists $PODNAME); then
+     echo "Using existing 'podman' pod $PODNAME"
+     LINKS="--pod $PODNAME "
+  #else
+     #echo "Create new 'podman' pod $PODNAME"
+     #podman pod create --infra=true -n $PODNAME --publish 8100:8100
+  fi
+  LINKS="--pod $PODNAME "
+fi
+
+# DOCKER doesn't have DNS out of the box, only links.  
+# so we add cm_always_ignore_ips in --env
+
 function run_it() {
+  if [ -n "${DUSER}" ]; then
+    USER_LINE="--user ${DUSER}"
+  fi
   $DOCKER run $@ \
+    $USER_LINE \
     -v "aaf_config:$CONF_ROOT_DIR" \
     -v "aaf_status:/opt/app/aaf/status" \
-    --add-host="$HOSTNAME:$HOST_IP" \
-    --add-host="aaf.osaaf.org:$HOST_IP" \
-    --env HOSTNAME=${HOSTNAME} \
+    $LINKS \
+    --env aaf_locator_container=docker \
+    --env aaf_locator_container_ns=${NAMESPACE} \
+    --env aaf_locator_fqdn=${HOSTNAME} \
+    --env aaf_locate_url=https://aaf-locate:8095 \
+    --env aaf_locator_public_fqdn=${HOSTNAME} \
+    --env cm_always_ignore_ips=true \
     --env AAF_ENV=${AAF_ENV} \
-    --env AAF_REGISTER_AS=${AAF_REGISTER_AS} \
-    --env AAF_LOCATOR_AS=${AAF_LOCATOR_AS} \
     --env LATITUDE=${LATITUDE} \
     --env LONGITUDE=${LONGITUDE} \
-    --env CASS_HOST=${CASS_HOST} \
     --env CASSANDRA_CLUSTER=${CASSANDRA_CLUSTER} \
     --env CASSANDRA_USER=${CASSANDRA_USER} \
     --env CASSANDRA_PASSWORD=${CASSANDRA_PASSWORD} \
     --env CASSANDRA_PORT=${CASSANDRA_PORT} \
     --name aaf_config_$USER \
     $PREFIX${ORG}/${PROJECT}/aaf_config:${VERSION} \
-    /bin/bash $PARAMS
+    bash -c "bash /opt/app/aaf_config/bin/agent.sh $PARAMS"
 }
 
-PARAMS="$@"
+PARAMS=$@
 case "$1" in 
   bash)
-    run_it -it --rm 
+    PARAMS="&& cd /opt/app/osaaf/local && exec bash"
+    run_it -it --rm  
     ;;
-  -it)
-    shift 
-    PARAMS="$@"
+  taillog)
     run_it -it --rm 
     ;;
   *)