diff options
author | Marco Platania <platania@research.att.com> | 2017-08-16 09:25:40 -0400 |
---|---|---|
committer | Marco Platania <platania@research.att.com> | 2017-08-16 09:25:40 -0400 |
commit | 6c850ae66f515d6990d2d94e02a5bc7be17d3a9f (patch) | |
tree | fa4d337dac44c016817fd982dbca2c860dc3075a /boot/aai_vm_init.sh | |
parent | 5008a779ccb979e1b7aa9ffa6238272f3471702b (diff) |
Add AAI searchservice entry to DNS configuration
- Add the searchservice entry to DNS zone file
- Rename aai2_* install/init scripts to aai_*
- Point Heat template to aai_* scripts
Change-Id: Ife73688cdc2cf01dc9aa89d8b91db79eea6ea15b
Issue-ID: AAI-128
Signed-off-by: Marco Platania <platania@research.att.com>
Diffstat (limited to 'boot/aai_vm_init.sh')
-rw-r--r-- | boot/aai_vm_init.sh | 45 |
1 files changed, 9 insertions, 36 deletions
diff --git a/boot/aai_vm_init.sh b/boot/aai_vm_init.sh index 6fcf7b0e..ffe0955f 100644 --- a/boot/aai_vm_init.sh +++ b/boot/aai_vm_init.sh @@ -1,43 +1,16 @@ #!/bin/bash -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) -DMAAP_TOPIC=$(cat /opt/config/dmaap_topic.txt) -DOCKER_IMAGE_VERSION=$(cat /opt/config/docker_version.txt) +AAI_INSTANCE=$(cat /opt/config/aai_instance.txt) -# Pull HBase container from a public docker hub -docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO -docker pull $NEXUS_DOCKER_REPO/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/aaidocker/aai-hbase-1.2.3 +cd /opt/test-config +git pull -# Wait 3 minutes before instantiating the A&AI container -sleep 180 - -docker pull $NEXUS_DOCKER_REPO/openecomp/ajsc-aai:$DOCKER_IMAGE_VERSION -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 AAI_REPO_PATH=r/aai -e AAI_CHEF_ENV=simpledemo -d -e AAI_CHEF_LOC=/var/chef/aai-data/environments -e docker_gitbranch=release-1.0.0 $NEXUS_DOCKER_REPO/openecomp/ajsc-aai:$DOCKER_IMAGE_VERSION - -docker pull $NEXUS_DOCKER_REPO/openecomp/model-loader:$DOCKER_IMAGE_VERSION -docker rm -f model-loader-service - -# Start Model Loader container only if SDC is up and running -# Use the default SDC private IP address if no file exists or the file is empty -if [[ -s "/opt/config/sdc_ip_addr.txt" ]] +if [[ $AAI_INSTANCE == "aai_instance_1" ]] +then + ./deploy_vm1.sh +elif [[ $AAI_INSTANCE == "aai_instance_2" ]] then - SDC_IP_ADDR=$(cat /opt/config/sdc_ip_addr.txt) + ./deploy_vm2.sh else - SDC_IP_ADDR="10.0.3.1" + echo "Invalid instance. Exiting..." fi - -# Run Health Check against SDC and verify that all five components are up -RES=$(curl http://$SDC_IP_ADDR:8181/sdc1/rest/healthCheck | grep -c "OK") -while [[ $RES -lt 5 ]] -do - RES=$(curl http://$SDC_IP_ADDR:8181/sdc1/rest/healthCheck | grep -c "OK") -done - -# At this point, SDC is healthy and Model Loader container can start -docker run --name=model-loader-service -it -d -e DISTR_CLIENT_ASDC_ADDRESS=c2.vm1.sdc.simpledemo.openecomp.org:8443 -e DISTR_CLIENT_ENVIRONMENT_NAME=$DMAAP_TOPIC -e DISTR_CLIENT_USER=aai -e DISTR_CLIENT_PASSWORD=OBF:1ks51l8d1o3i1pcc1r2r1e211r391kls1pyj1z7u1njf1lx51go21hnj1y0k1mli1sop1k8o1j651vu91mxw1vun1mze1vv11j8x1k5i1sp11mjc1y161hlr1gm41m111nkj1z781pw31kku1r4p1e391r571pbm1o741l4x1ksp -e APP_SERVER_BASE_URL=https://c1.vm1.aai.simpledemo.openecomp.org:8443 -e APP_SERVER_KEYSTORE_PASSWORD=OBF:1i9a1u2a1unz1lr61wn51wn11lss1unz1u301i6o -e APP_SERVER_AUTH_USER=ModelLoader -e APP_SERVER_AUTH_PASSWORD=OBF:1qvu1v2h1sov1sar1wfw1j7j1wg21saj1sov1v1x1qxw $NEXUS_DOCKER_REPO/openecomp/model-loader:$DOCKER_IMAGE_VERSION - |