X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=deploy_vm2.sh;h=ccfa33f146ce688394f8cf075c2daae0dd7f05b2;hb=e64f08ac8242a7db6eb3238ee0ad1a30c8aecf0d;hp=5de0e8df0b12b8102c3bec3639f0318ce5b39b69;hpb=392c7d25bae9e19cb1dcbbe303ed4c64944c92b0;p=aai%2Ftest-config.git

diff --git a/deploy_vm2.sh b/deploy_vm2.sh
index 5de0e8d..ccfa33f 100755
--- a/deploy_vm2.sh
+++ b/deploy_vm2.sh
@@ -9,14 +9,14 @@ 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_VERSION="${HBASE_VERSION:-1.0.0}";
+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)
@@ -29,19 +29,18 @@ 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}:${HBASE_VERSION};
+docker pull cassandra:2.1;
 
 # 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';
+CASSANDRA_CONTAINER_NAME=$($DOCKER_COMPOSE_CMD up -d aai.hbase.simpledemo.onap.org 2>&1 | grep 'Creating' | grep -v 'volume' | grep -v 'network' | awk '{ print $2; }' | head -1);
+wait_for_container $CASSANDRA_CONTAINER_NAME 'Listening for thrift clients';
 
 $DOCKER_COMPOSE_CMD up -d aai.elasticsearch.simpledemo.openecomp.org