X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=boot%2Faaf_vm_init.sh;h=a388bf2f143379857f2b0816857ff50d62145214;hb=17ba9563e942f9f49179f5606a062f46e0267725;hp=ea64c3e5eac9f3335eee52e00cc07ee5ec1242c2;hpb=b867607b987305df8bfc846e17322c53304cc7b1;p=demo.git diff --git a/boot/aaf_vm_init.sh b/boot/aaf_vm_init.sh index ea64c3e5..a388bf2f 100644 --- a/boot/aaf_vm_init.sh +++ b/boot/aaf_vm_init.sh @@ -6,27 +6,19 @@ NEXUS_DOCKER_REPO=$(cat /opt/config/nexus_docker_repo.txt) DOCKER_IMAGE_VERSION=$(cat /opt/config/docker_version.txt) HOSTNAME=`hostname` FQDN=aaf.api.simpledemo.onap.org -HOST_IP=$(cat /opt/config/dns_ip_addr.txt) +HOST_IP=$(cat /opt/config/local_ip.txt) docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO cd /opt/authz git pull + +cd /opt/authz/auth/auth-cass/docker if [ "`docker container ls | grep aaf_cass`" = "" ]; then # Cassandra Install - cd /opt/authz/auth/auth-cass/docker - # Phase 1 + echo Phase 1 Cassandra Install ./dinstall.sh - echo "Waiting for Cassandra to startup" - sleep 15 - # Phase 2 - if [ "`docker container ls | grep aaf_cass`" = "" ]; then - echo "Error on Cassandra install" - exit - else - ./dinstall.sh - fi fi CASS_IP=`docker inspect aaf_cass | grep '"IPAddress' | head -1 | cut -d '"' -f 4` @@ -60,4 +52,4 @@ sed -i "s/cadi_trust_masks=.*/cadi_trust_masks="$CADI_TRUST_MASKS"/g" /opt/app/o cd /opt/authz/auth/docker ./dbuild.sh sleep 5 -./drun.sh \ No newline at end of file +./drun.sh