Update the deploy and compose script for hbase

Change-Id: I3d7d6f3be743d65cc630a61e60c5f0276240f706
Signed-off-by: Venkata Harish K Kajur <vk250x@att.com>

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';

diff --git a/docker-compose-db.yml b/docker-compose-db.yml
index d6e1caf..4b6ebe3 100644 (file)
--- a/docker-compose-db.yml
+++ b/docker-compose-db.yml
@@ -4,14 +4,13 @@ services:
     image: ${HBASE_IMAGE}
     hostname: aai.hbase.simpledemo.openecomp.org
     ports:
-      - 50020:50020
       - 2181:2181
+      - 8080:8080
+      - 8085:8085
+      - 9090:9090
+      - 16000:16000
       - 16010:16010
-      - 50090:50090
-      - 16301:16301
-      - 50070:50070
-      - 50010:50010
-      - 50075:50075
+      - 16201:16201
     logging:
       driver: "json-file"
       options: