Merge "Spring-boot config upgrade"

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

diff --git a/deploy_vm2.sh b/deploy_vm2.sh
index f790c35..ccfa33f 100755 (executable)
--- a/deploy_vm2.sh
+++ b/deploy_vm2.sh
@@ -16,7 +16,7 @@ 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,20 +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 ' 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';
+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