X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=deploy_vm2.sh;h=3589e1ce69a1542c6ba47de55a452744044f29b5;hb=ff6a79dec5c7a0ae2377c17f64171cdea805e40d;hp=8879af2fd50fa7f5c82107d5ecbeb58f93b536cf;hpb=81281e1614adce2513d86342807477249f756c01;p=aai%2Ftest-config.git

diff --git a/deploy_vm2.sh b/deploy_vm2.sh
index 8879af2..3589e1c 100755
--- a/deploy_vm2.sh
+++ b/deploy_vm2.sh
@@ -7,53 +7,16 @@ else
     DOCKER_COMPOSE_CMD="docker-compose -f docker-compose-db.yml"
 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
-    echo "Warning: Unable to find the volume directory $RESOURCES_LOGS so creating it as regular directory";
-    mkdir -p $RESOURCES_LOGS;
-fi;
-
-if [ ! -d "$TRAVERSAL_LOGS" ];
-then
-    echo "Warning: Unable to find the volume directory $TRAVERSAL_LOGS so creating it as regular directory";
-    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=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1);
-#export HBASE_IMAGE="${HBASE_IMAGE:-aaionap/hbase}";
-export HBASE_IMAGE="${HBASE_IMAGE:-harisekhon/hbase}";
-export GREMLIN_SERVER_IMAGE="${GREMLIN_SERVER_IMAGE:-aaionap/gremlin-server}";
+export HBASE_IMAGE="${HBASE_IMAGE:-aaionap/hbase}";
+export HBASE_VERSION="${HBASE_VERSION:-1.2.0}";
 
 function wait_for_container() {
 
     CONTAINER_NAME="$1";
     START_TEXT="$2";
 
-    TIMEOUT=160
+    TIMEOUT=600
 
     # wait for the real startup
     AMOUNT_STARTUP=$(docker logs ${CONTAINER_NAME} 2>&1 | grep "$START_TEXT" | wc -l)
@@ -66,27 +29,20 @@ function wait_for_container() {
             echo "ERROR: $CONTAINER_NAME deployment failed."
             exit 1
         fi
-        let TIMEOUT-=1
-        sleep 1
+        let TIMEOUT-=5
+        sleep 5
     done
 }
 
-docker pull ${HBASE_IMAGE};
-docker pull ${GREMLIN_SERVER_IMAGE};
+docker pull ${HBASE_IMAGE}:${HBASE_VERSION};
 
 # cleanup
 $DOCKER_COMPOSE_CMD stop
 $DOCKER_COMPOSE_CMD rm -f -v
 
 HBASE_CONTAINER_NAME=$($DOCKER_COMPOSE_CMD up -d aai.hbase.simpledemo.openecomp.org 2>&1 | grep 'Creating' | grep -v 'volume' | grep -v 'network' | awk '{ print $2; }' | head -1);
-#wait_for_container $HBASE_CONTAINER_NAME '^starting regionserver';
-#wait_for_container $HBASE_CONTAINER_NAME 'HBase metrics system started';
 wait_for_container $HBASE_CONTAINER_NAME ' Started SelectChannelConnector@0.0.0.0:8085';
 wait_for_container $HBASE_CONTAINER_NAME ' Started SelectChannelConnector@0.0.0.0:8080';
 wait_for_container $HBASE_CONTAINER_NAME ' Started SelectChannelConnector@0.0.0.0:9095';
 
-
-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