summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVenkata Harish K Kajur <vk250x@att.com>2017-09-17 15:09:54 +0000
committerVenkata Harish K Kajur <vk250x@att.com>2017-09-19 04:13:53 +0000
commitfccdc6398e7fb54332d99bd284118504e24efcdc (patch)
tree9e83fa5c466e8d3641a9f5822cb4671e2888790d
parentc3e6d3471f62d0e521c418f5bd810ecf47405e52 (diff)
Change docker-compose to start all containers
Move the wait for it in the docker container instead of it being in the outside to spin up all the containers at once Issue-ID: AAI-307 Change-Id: I2643b1c1a59f5e9e7d900012d216ab4f51995fbf Signed-off-by: Venkata Harish K Kajur <vk250x@att.com>
-rwxr-xr-xdeploy_vm1.sh21
1 files changed, 5 insertions, 16 deletions
diff --git a/deploy_vm1.sh b/deploy_vm1.sh
index 54d3c79..b392930 100755
--- a/deploy_vm1.sh
+++ b/deploy_vm1.sh
@@ -143,22 +143,11 @@ 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
-$DOCKER_COMPOSE_CMD up -d aai.api.simpledemo.openecomp.org
-echo "A&AI Microservices, resources and traversal, are up and running along with HAProxy";
+# Deploy haproxy and traversal and resources
+$DOCKER_COMPOSE_CMD up -d aai.api.simpledemo.openecomp.org aai-resources.api.simpledemo.openecomp.org aai-traversal.api.simpledemo.openecomp.org
-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";