X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fdocker%2Faaf.sh;h=b498428bf31636abf118289110883801614c49b4;hb=dba91fb2b1a12b34691840af97cfbb5fd28917d7;hp=ac888390fd85a5beb7cad30fade336ae9f0ffc4c;hpb=27afb0201ce717c25d8ffcc50f8b4972fc98f5c5;p=aaf%2Fauthz.git diff --git a/auth/docker/aaf.sh b/auth/docker/aaf.sh index ac888390..b498428b 100644 --- a/auth/docker/aaf.sh +++ b/auth/docker/aaf.sh @@ -23,11 +23,17 @@ DOCKER=${DOCKER:=docker} # if something, may not want CASS attached all the tim -LINKS="--link $CASSANDRA_DOCKER" +#LINKS="--link $CASSANDRA_DOCKER" + +# 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 aaf \ + $USER_LINE \ -v "aaf_config:$CONF_ROOT_DIR" \ -v "aaf_status:/opt/app/aaf/status" \ $LINKS \ @@ -35,7 +41,8 @@ function run_it() { --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} \