update A&AI init script

Change-Id: If5b2939b0b656aaddd3053c1aec295474c027974
Signed-off-by: platania <platania@research.att.com>

diff --git a/.DS_Store b/.DS_Store
index 1c33ab3..1fd6750 100644 (file)
Binary files a/.DS_Store and b/.DS_Store differ

diff --git a/boot/aai_vm_init.sh b/boot/aai_vm_init.sh
index 4ad0b8e..92b7e58 100644 (file)
--- a/boot/aai_vm_init.sh
+++ b/boot/aai_vm_init.sh
@@ -8,15 +8,15 @@ GITLAB_CERTNAME=$(cat /opt/config/gitlab_certname.txt)
 GITLAB_USERNAME=$(cat /opt/config/gitlab_username.txt)
 GITLAB_PASSWD=$(cat /opt/config/gitlab_password.txt)
 
-docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO
-
-docker pull $NEXUS_DOCKER_REPO/openecomp/aai-hbase-1.2.3
+# Pull HBase container from a public docker hub
+docker pull aaidocker/aai-hbase-1.2.3
 docker rm -f hbase-1.2.3
-docker run -d --net=host --name="hbase-1.2.3" $NEXUS_DOCKER_REPO/openecomp/aai-hbase-1.2.3
+docker run -d --net=host --name="hbase-1.2.3" aaidocker/aai-hbase-1.2.3
 
 # Wait 3 minutes before instantiating the A&AI container
 sleep 180
 
+docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO
 docker pull $NEXUS_DOCKER_REPO/openecomp/ajsc-aai:latest
 docker rm -f aai-service
 docker run --name=aai-service --net=host -v /etc/ssl/certs/ca-certificates.crt:/etc/ssl/certs/ca-certificates.crt -it -e GITLAB_CERTNAME=$GITLAB_CERTNAME -e GITLAB_USERNAME=$GITLAB_USERNAME -e GITLAB_PASSWORD=$GITLAB_PASSWD -e AAI_REPO_PATH=r/aai -e AAI_CHEF_ENV=simpledemo -d -e AAI_CHEF_LOC=/var/chef/aai-data/environments -e docker_gitbranch=develop $NEXUS_DOCKER_REPO/openecomp/ajsc-aai:latest