Fix traversal aaiconfig to use traversal values

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

diff --git a/deploy_vm1.sh b/deploy_vm1.sh
index fd97fe6..d51d8d1 100755 (executable)
--- a/deploy_vm1.sh
+++ b/deploy_vm1.sh
@@ -150,20 +150,19 @@ USER_EXISTS=$(check_if_user_exists aaiadmin);
 
 if [ "${USER_EXISTS}" -eq 0 ]; then
         export USER_ID=9000;
+        export GROUP_ID=9000;
 else
         export USER_ID=$(id -u aaiadmin);
+        export GROUP_ID=$(id -g aaiadmin);
 fi;
 
 chown -R $USER_ID:$USER_ID $RESOURCE_LOGS $TRAVERSAL_LOGS;
 
 RESOURCES_CONTAINER_NAME=$($DOCKER_COMPOSE_CMD up -d aai-resources.api.simpledemo.onap.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';
+wait_for_container $RESOURCES_CONTAINER_NAME 'Resources Microservice Started';
 
-GRAPH_CONTAINER_NAME=$($DOCKER_COMPOSE_CMD up -d aai-traversal.api.simpledemo.onap.org 2>&1 | grep 'Creating' | awk '{ print $2; }' | head -1);
-wait_for_container $GRAPH_CONTAINER_NAME '0.0.0.0:8446';
-
-# Deploy haproxy and traversal and resources
-$DOCKER_COMPOSE_CMD up -d aai.api.simpledemo.onap.org
+# Deploy haproxy and traversal at the same time for traversal to make updateQuery against resources using haproxy
+$DOCKER_COMPOSE_CMD up -d aai-traversal.api.simpledemo.onap.org aai.api.simpledemo.onap.org
 
 $DOCKER_COMPOSE_CMD up -d sparky-be