Merge "Updating host volume directory"

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

diff --git a/deploy_vm2.sh b/deploy_vm2.sh
index 01631e3..4e6f725 100755 (executable)
--- a/deploy_vm2.sh
+++ b/deploy_vm2.sh
@@ -43,10 +43,10 @@ then
     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,18 @@ 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';
-#wait_for_container $HBASE_CONTAINER_NAME 'HBase metrics system started';
+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';
 
 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