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

diff --git a/auth/docker/aaf.sh b/auth/docker/aaf.sh
index 3ed7eafb..d0393d0a 100644
--- a/auth/docker/aaf.sh
+++ b/auth/docker/aaf.sh
@@ -21,15 +21,37 @@
 
 . ./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" \
+    $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_hostname=$HOSTNAME \
+    --env aaf_locator_public_fqdn=${HOSTNAME} \
+    --env cm_always_ignore_ips=true \
     --env AAF_ENV=${AAF_ENV} \
     --env LATITUDE=${LATITUDE} \
     --env LONGITUDE=${LONGITUDE} \