X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fdocker%2Fagent.sh;h=0abce9c633128987bcea0b8210c0257d1dca1f8f;hb=HEAD;hp=eb1888c17a1ccffdbc322a8e5077c89c9abccecd;hpb=be7e0d14765b8fb1520c457ab99ddedf0f7ab65e;p=aaf%2Fauthz.git

diff --git a/auth/docker/agent.sh b/auth/docker/agent.sh
index eb1888c1..0abce9c6 100644
--- a/auth/docker/agent.sh
+++ b/auth/docker/agent.sh
@@ -28,7 +28,8 @@ fi
 . ./aaf.props
 
 DOCKER=${DOCKER:=docker}
-CADI_VERSION=${CADI_VERSION:=2.1.11-SNAPSHOT}
+VERSION=${VERSION}
+CADI_VERSION=${CADI_VERSION:=${VERSION}}
 
 for V in VERSION DOCKER_REPOSITORY HOSTNAME CONTAINER_NS AAF_FQDN AAF_FQDN_IP DEPLOY_FQI APP_FQDN APP_FQI VOLUME DRIVER LATITUDE LONGITUDE; do
    if [ "$(grep $V ./aaf.props)" = "" ]; then
@@ -110,8 +111,9 @@ function run_it() {
   fi
   $DOCKER run  -it  --rm \
     ${USER_LINE} \
-    -v "${VOLUME}:/opt/app/osaaf" \
+    -v "${VOLUME}:/opt/app/osaaf/local" \
     --add-host="$AAF_FQDN:$AAF_FQDN_IP" \
+    $USER_LINE \
     --env AAF_FQDN=${AAF_FQDN} \
     --env DEPLOY_FQI=${DEPLOY_FQI} \
     --env DEPLOY_PASSWORD=${DEPLOY_PASSWORD} \
@@ -121,6 +123,7 @@ function run_it() {
     --env LONGITUDE=${LONGITUDE} \
     --env aaf_locator_container_ns=${CONTAINER_NS} \
     --env aaf_locator_container=docker \
+    --link aaf-service --link aaf-locate --link aaf-oauth --link aaf-cm \
     --name aaf-agent-$USER \
     "$PREFIX"onap/aaf/aaf_agent:$VERSION \
     bash -c "bash /opt/app/aaf_config/bin/agent.sh $PARAMS"
@@ -136,6 +139,7 @@ function reset_sso {
     mkdir -p ~/.aaf
     > $HOME/.aaf/sso.props
     sso aaf_locate_url "https://$AAF_FQDN:8095"
+    sso aaf_url_cm "https://$AAF_FQDN:8150"
     sso cadi_latitude "$LATITUDE"
     sso cadi_longitude "$LONGITUDE"
     sso cadi_loglevel "DEBUG"