X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=heat%2FONAP%2Fcloud-config%2Faaf_install.sh;h=90bc6f63f92b7760190664bb8573bf4955ef94d4;hb=503068c084efe36f2349413679a3f3602641b094;hp=d358364e05e853c1c23ec8bc0df5e229bfd3dc97;hpb=cc013641c8629f77e0061bfb57896fd8c2f24aaa;p=demo.git

diff --git a/heat/ONAP/cloud-config/aaf_install.sh b/heat/ONAP/cloud-config/aaf_install.sh
index d358364e..90bc6f63 100644
--- a/heat/ONAP/cloud-config/aaf_install.sh
+++ b/heat/ONAP/cloud-config/aaf_install.sh
@@ -7,11 +7,8 @@ NEXUS_USERNAME=$(cat /opt/config/nexus_username.txt)
 NEXUS_PASSWD=$(cat /opt/config/nexus_password.txt)
 NEXUS_DOCKER_REPO=$(cat /opt/config/nexus_docker_repo.txt)
 AAF_DOCKER_VERSION=$(cat /opt/config/docker_version.txt)
-HOSTNAME=`hostname -f`
-FQDN=aaf.api.simpledemo.onap.org
-HOST_IP=$(cat /opt/config/local_ip.txt)
  
-echo "$NEXUS_PASSWD" | docker login -u $NEXUS_USERNAME --password-stdin $NEXUS_DOCKER_REPO
+docker login -u $NEXUS_USERNAME -p "$NEXUS_PASSWD" $NEXUS_DOCKER_REPO
 
 if [ -e "/opt/authz" ]; then
   cd /opt/authz
@@ -21,17 +18,9 @@ else
   git clone https://gerrit.onap.org/r/aaf/authz
   cd authz
 fi
+cd $CURRENT_DIR
 
-cd /opt/authz/auth/auth-cass/docker
-if [ "`docker container ls | grep aaf_cass`" = "" ]; then
-   # Cassandra Install
-   echo Phase 1 Cassandra Install
-   /bin/bash ./dinstall.sh
-fi
- 
-CASS_IP=`docker inspect aaf_cass | grep '"IPAddress' | head -1 | cut -d '"' -f 4`
-CASS_HOST="cass.aaf.osaaf.org:"$CASS_IP
- 
+docker pull $NEXUS_DOCKER_REPO/onap/aaf/aaf_cass:$AAF_DOCKER_VERSION
 docker pull $NEXUS_DOCKER_REPO/onap/aaf/aaf_config:$AAF_DOCKER_VERSION
 docker pull $NEXUS_DOCKER_REPO/onap/aaf/aaf_cm:$AAF_DOCKER_VERSION
 docker pull $NEXUS_DOCKER_REPO/onap/aaf/aaf_fs:$AAF_DOCKER_VERSION
@@ -41,6 +30,5 @@ docker pull $NEXUS_DOCKER_REPO/onap/aaf/aaf_locate:$AAF_DOCKER_VERSION
 docker pull $NEXUS_DOCKER_REPO/onap/aaf/aaf_oauth:$AAF_DOCKER_VERSION
 docker pull $NEXUS_DOCKER_REPO/onap/aaf/aaf_service:$AAF_DOCKER_VERSION
  
-cd $CURRENT_DIR
 /bin/bash ./aaf_vm_init.sh