From 8f3ba2c2b0c877bd7238ced1a472607d36147f0e Mon Sep 17 00:00:00 2001
From: Venkata Harish K Kajur <vk250x@att.com>
Date: Tue, 30 May 2017 13:37:52 -0400
Subject: [PATCH] Fix the typo in the docker tag pull

Change-Id: Ia38e3ca9341da5f35ca02f1f17aa80435763040d
Signed-off-by: Venkata Harish K Kajur <vk250x@att.com>
---
 deploy_vm1.sh         | 12 ++++++------
 deploy_vm2.sh         |  8 ++++----
 docker-compose-db.yml |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/deploy_vm1.sh b/deploy_vm1.sh
index c07b26e..5f95498 100755
--- a/deploy_vm1.sh
+++ b/deploy_vm1.sh
@@ -43,9 +43,9 @@ then
     mkdir -p $MODEL_LOADER_LOGS;
 fi;
 
-export MTU=${MTU:-1500};
+export MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1);
 export DOCKER_REGISTRY="${DOCKER_REGISTRY:-localhost:5000}";
-export AAI_HAPROXY_IMAGE="${AAI_HAPROXY_IMAGE:-hkajur93/aai-haproxy}";
+export AAI_HAPROXY_IMAGE="${AAI_HAPROXY_IMAGE:-aaionap/haproxy}";
 
 NEXUS_USERNAME=$(cat /opt/config/nexus_username.txt)
 NEXUS_PASSWD=$(cat /opt/config/nexus_password.txt)
@@ -86,13 +86,13 @@ docker pull ${DOCKER_REGISTRY}/openecomp/aai-traversal:${DOCKER_IMAGE_VERSION};
 docker tag $DOCKER_REGISTRY/openecomp/aai-traversal:$DOCKER_IMAGE_VERSION $DOCKER_REGISTRY/openecomp/aai-traversal:latest;
 
 docker pull ${DOCKER_REGISTRY}/openecomp/search-data-service:${DOCKER_IMAGE_VERSION};
-docker tag $DOCKER_REGISTRY/openecomp/search-data-service:$DOCKER_IMAGE_VERSION $DOCKER_REGISTRY/openecomp/aai-traversal:latest;
+docker tag $DOCKER_REGISTRY/openecomp/search-data-service:$DOCKER_IMAGE_VERSION $DOCKER_REGISTRY/openecomp/search-data-service:latest;
 
 docker pull ${DOCKER_REGISTRY}/openecomp/datarouter-service:${DOCKER_IMAGE_VERSION};
-docker tag $DOCKER_REGISTRY/openecomp/datarouter-service:$DOCKER_IMAGE_VERSION $DOCKER_REGISTRY/openecomp/aai-traversal:latest;
+docker tag $DOCKER_REGISTRY/openecomp/datarouter-service:$DOCKER_IMAGE_VERSION $DOCKER_REGISTRY/openecomp/datarouter-service:latest;
 
 docker pull ${DOCKER_REGISTRY}/openecomp/model-loader:${DOCKER_IMAGE_VERSION};
-docker tag $DOCKER_REGISTRY/openecomp/model-loader:$DOCKER_IMAGE_VERSION $DOCKER_REGISTRY/openecomp/aai-traversal:latest;
+docker tag $DOCKER_REGISTRY/openecomp/model-loader:$DOCKER_IMAGE_VERSION $DOCKER_REGISTRY/openecomp/model-loader:latest;
 
 # cleanup
 $DOCKER_COMPOSE_CMD stop
@@ -104,7 +104,7 @@ GROUP_ID=$(docker run -it --rm --entrypoint=id $DOCKER_REGISTRY/openecomp/aai-re
 chown -R $USER_ID:$GROUP_ID $RESOURCES_LOGS;
 chown -R $USER_ID:$GROUP_ID $TRAVERSAL_LOGS;
 
-RESOURCES_CONTAINER_NAME=$($DOCKER_COMPOSE_CMD up -d aai-resources.api.simpledemo.openecomp.org 2>&1 | grep 'Creating' | awk '{ print $2; }' | head -1);
+RESOURCES_CONTAINER_NAME=$($DOCKER_COMPOSE_CMD up -d aai-resources.api.simpledemo.openecomp.org 2>&1 | grep 'Creating' | grep -v 'volume' | grep -v 'network' | awk '{ print $2; }' | head -1);
 wait_for_container $RESOURCES_CONTAINER_NAME '0.0.0.0:8447';
 
 GRAPH_CONTAINER_NAME=$($DOCKER_COMPOSE_CMD up -d aai-traversal.api.simpledemo.openecomp.org 2>&1 | grep 'Creating' | awk '{ print $2; }' | head -1);
diff --git a/deploy_vm2.sh b/deploy_vm2.sh
index 247653d..6a7fac3 100755
--- a/deploy_vm2.sh
+++ b/deploy_vm2.sh
@@ -43,10 +43,10 @@ then
     mkdir -p $MODEL_LOADER_LOGS;
 fi;
 
-export MTU=${MTU:-1500};
-export HBASE_IMAGE="${HBASE_IMAGE:-hkajur93/aai-hbase-1.2.3}";
+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 GREMLIN_SERVER_IMAGE="${GREMLIN_SERVER_IMAGE:-hkajur93/gremlin-server}";
+export GREMLIN_SERVER_IMAGE="${GREMLIN_SERVER_IMAGE:-aaionap/gremlin-server}";
 
 function wait_for_container() {
 
@@ -78,7 +78,7 @@ docker pull ${GREMLIN_SERVER_IMAGE};
 $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 'network' | awk '{ print $2; }' | head -1);
+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';
 
diff --git a/docker-compose-db.yml b/docker-compose-db.yml
index a023378..d6e1caf 100644
--- a/docker-compose-db.yml
+++ b/docker-compose-db.yml
@@ -41,7 +41,7 @@ services:
     ports:
       - "9200:9200"
     volumes:
-      - /opt/app/elasticsearch/config/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml
+      - /opt/test-config/elasticsearch/config/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml
       - es-data:/usr/share/elasticsearch/data
     logging:
       driver: "json-file"
-- 
2.16.6