Merge "Updated the data-router image name."

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

diff --git a/deploy_vm2.sh b/deploy_vm2.sh
index 305a2b2..247653d 100755 (executable)
--- a/deploy_vm2.sh
+++ b/deploy_vm2.sh
@@ -9,6 +9,9 @@ fi
 
 export RESOURCES_LOGS="/opt/aai/logroot/AAI-RESOURCES";
 export TRAVERSAL_LOGS="/opt/aai/logroot/AAI-TRAVERSAL";
+export SEARCH_LOGS="/opt/aai/logroot/AAI-SEARCH";
+export DATA_ROUTER_LOGS="/opt/aai/logroot/AAI-DATA-ROUTER";
+export MODEL_LOADER_LOGS="/opt/aai/logroot/AAI-MODEL-LOADER";
 
 if [ ! -d "$RESOURCES_LOGS" ];
 then
@@ -22,10 +25,28 @@ then
     mkdir -p $TRAVERSAL_LOGS;
 fi;
 
+if [ ! -d "$SEARCH_LOGS" ];
+then
+    echo "Warning: Unable to find the volume directory $SEARCH_LOGS so creating it as regular directory";
+    mkdir -p $SEARCH_LOGS;
+fi;
+
+if [ ! -d "$DATA_ROUTER_LOGS" ];
+then
+    echo "Warning: Unable to find the volume directory $DATA_ROUTER_LOGS so creating it as regular directory";
+    mkdir -p $DATA_ROUTER_LOGS;
+fi;
+
+if [ ! -d "$MODEL_LOADER_LOGS" ];
+then
+    echo "Warning: Unable to find the volume directory $MODEL_LOADER_LOGS so creating it as regular directory";
+    mkdir -p $MODEL_LOADER_LOGS;
+fi;
+
 export MTU=${MTU:-1500};
-export HBASE_IMAGE="${HBASE_IMAGE:-wc9368/aai-hbase-1.2.3}";
+export HBASE_IMAGE="${HBASE_IMAGE:-hkajur93/aai-hbase-1.2.3}";
 #export HBASE_IMAGE="${HBASE_IMAGE:-harisekhon/hbase}";
-export GREMLIN_SERVER_IMAGE="${GREMLIN_SERVER_IMAGE:-gremlin-server}";
+export GREMLIN_SERVER_IMAGE="${GREMLIN_SERVER_IMAGE:-hkajur93/gremlin-server}";
 
 function wait_for_container() {
 
@@ -50,6 +71,9 @@ function wait_for_container() {
     done
 }
 
+docker pull ${HBASE_IMAGE};
+docker pull ${GREMLIN_SERVER_IMAGE};
+
 # cleanup
 $DOCKER_COMPOSE_CMD stop
 $DOCKER_COMPOSE_CMD rm -f -v
@@ -61,3 +85,4 @@ wait_for_container $HBASE_CONTAINER_NAME '^starting regionserver';
 GREMLIN_CONTAINER_NAME=$($DOCKER_COMPOSE_CMD up -d aai.gremlinserver.simpledemo.openecomp.org 2>&1 | grep 'Creating' | awk '{ print $2; }' | head -1);
 wait_for_container $GREMLIN_CONTAINER_NAME 'Channel started at port 8182';
 
+$DOCKER_COMPOSE_CMD up -d aai.elasticsearch.simpledemo.openecomp.org