Change the docker startup to wait before

[aai/test-config.git] / deploy_vm1.sh

diff --git a/deploy_vm1.sh b/deploy_vm1.sh
index 54d3c79..278cfd3 100755 (executable)
--- a/deploy_vm1.sh
+++ b/deploy_vm1.sh
@@ -68,7 +68,7 @@ function wait_for_container() {
     CONTAINER_NAME="$1";
     START_TEXT="$2";
 
-    TIMEOUT=160
+    TIMEOUT=360
 
     # wait for the real startup
     AMOUNT_STARTUP=$(docker logs ${CONTAINER_NAME} 2>&1 | grep "$START_TEXT" | wc -l)
@@ -102,14 +102,6 @@ function check_if_user_exists(){
         }
 }
 
-
-if [ ! -d "/opt/message-router" ]; then
-    (cd /opt && \
-        git clone http://gerrit.onap.org/r/dcae/demo/startup/message-router && \
-        cd message-router && \
-        ./deploy.sh);
-fi
-
 docker pull ${DOCKER_REGISTRY}/openecomp/aai-resources:${DOCKER_IMAGE_VERSION};
 docker tag $DOCKER_REGISTRY/openecomp/aai-resources:$DOCKER_IMAGE_VERSION $DOCKER_REGISTRY/openecomp/aai-resources:latest;
 
@@ -143,22 +135,17 @@ fi;
 
 chown -R $USER_ID:$USER_ID $RESOURCE_LOGS $TRAVERSAL_LOGS;
 
-$DOCKER_COMPOSE_CMD up -d sparky-be
-
 RESOURCES_CONTAINER_NAME=$($DOCKER_COMPOSE_CMD up -d aai-resources.api.simpledemo.openecomp.org 2>&1 | grep 'Creating' | grep -v 'volume' | grep -v 'network' | awk '{ print $2; }' | head -1);
 wait_for_container $RESOURCES_CONTAINER_NAME '0.0.0.0:8447';
 
 GRAPH_CONTAINER_NAME=$($DOCKER_COMPOSE_CMD up -d aai-traversal.api.simpledemo.openecomp.org 2>&1 | grep 'Creating' | awk '{ print $2; }' | head -1);
 wait_for_container $GRAPH_CONTAINER_NAME '0.0.0.0:8446';
 
-# deploy
+# Deploy haproxy and traversal and resources
 $DOCKER_COMPOSE_CMD up -d aai.api.simpledemo.openecomp.org
-echo "A&AI Microservices, resources and traversal, are up and running along with HAProxy";
 
-docker exec -it $GRAPH_CONTAINER_NAME "/opt/app/aai-traversal/scripts/install/updateQueryData.sh" && {
-       echo "Successfully loaded the widget related data into db";
-} || {
-       echo "Unable to load widget related data into db";
-}
+$DOCKER_COMPOSE_CMD up -d sparky-be
 
 $DOCKER_COMPOSE_CMD up -d model-loader datarouter aai.searchservice.simpledemo.openecomp.org
+
+echo "A&AI Microservices are successfully started";