Change the hbase docker image to aaionap/hbase

Issue-ID: AAI-397
Change-Id: I07b0c1df108db05850bb98e24ec2620488125603
Signed-off-by: Venkata Harish K Kajur <vk250x@att.com>

diff --git a/deploy_vm2.sh b/deploy_vm2.sh
index 1523aa7..5de0e8d 100755 (executable)
--- a/deploy_vm2.sh
+++ b/deploy_vm2.sh
@@ -8,8 +8,8 @@ else
 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_VERSION="${HBASE_VERSION:-1.0.0}";
 
 function wait_for_container() {
 
@@ -34,7 +34,7 @@ function wait_for_container() {
     done
 }
 
-docker pull ${HBASE_IMAGE};
+docker pull ${HBASE_IMAGE}:${HBASE_VERSION};
 
 # cleanup
 $DOCKER_COMPOSE_CMD stop
@@ -42,9 +42,6 @@ $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 ' 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';
+wait_for_container $HBASE_CONTAINER_NAME 'HBase metrics system started';
 
 $DOCKER_COMPOSE_CMD up -d aai.elasticsearch.simpledemo.openecomp.org

diff --git a/docker-compose-db.yml b/docker-compose-db.yml
index 872e460..c66d651 100644 (file)
--- a/docker-compose-db.yml
+++ b/docker-compose-db.yml
@@ -1,7 +1,7 @@
 version: '2'
 services:
   aai.hbase.simpledemo.openecomp.org:
-    image: ${HBASE_IMAGE}
+    image: ${HBASE_IMAGE}:${HBASE_VERSION}
     hostname: aai.hbase.simpledemo.openecomp.org
     ports:
       - 2181:2181