X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fdocker%2Faaf.sh;h=d0393d0afcb8aa70e0b1e38639b1249bd4737d01;hb=b6106cffafc89a9c3051c3196f54df643197e4ad;hp=23822e52172d8d5fb5b51b54fa1bdb154aa2faa9;hpb=8748d6d6d0c654134712a26fa795520d895ca878;p=aaf%2Fauthz.git diff --git a/auth/docker/aaf.sh b/auth/docker/aaf.sh index 23822e52..d0393d0a 100644 --- a/auth/docker/aaf.sh +++ b/auth/docker/aaf.sh @@ -21,9 +21,21 @@ . ./d.props -DOCKER=${DOCKER:=docker} -# if something, may not want CASS attached all the tim -#LINKS="--link $CASSANDRA_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 @@ -39,6 +51,7 @@ function run_it() { --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 LATITUDE=${LATITUDE} \ --env LONGITUDE=${LONGITUDE} \