Syncing up the index names

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

diff --git a/deploy_vm2.sh b/deploy_vm2.sh
index d890528..8879af2 100755 (executable)
--- a/deploy_vm2.sh
+++ b/deploy_vm2.sh
@@ -10,8 +10,8 @@ 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";
+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
@@ -31,22 +31,22 @@ then
     mkdir -p $SEARCH_LOGS;
 fi;
 
-if [ ! -d "$DATA-ROUTER_LOGS" ];
+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;
+    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" ];
+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;
+    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:-harisekhon/hbase}";
-export GREMLIN_SERVER_IMAGE="${GREMLIN_SERVER_IMAGE:-gremlin-server}";
+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}";
 
 function wait_for_container() {
 
@@ -71,13 +71,22 @@ 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
 
-HBASE_CONTAINER_NAME=$($DOCKER_COMPOSE_CMD up -d aai.hbase.simpledemo.openecomp.org 2>&1 | grep 'Creating' | grep -v 'network' | awk '{ print $2; }' | head -1);
-wait_for_container $HBASE_CONTAINER_NAME '^starting regionserver';
+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