Merge "Updating host volume directory"

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

diff --git a/deploy_vm2.sh b/deploy_vm2.sh
index 6a7fac3..4e6f725 100755 (executable)
--- a/deploy_vm2.sh
+++ b/deploy_vm2.sh
@@ -44,8 +44,8 @@ then
 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 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() {
@@ -79,8 +79,8 @@ $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 '^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';