diff options
| author |   Venkata Harish K Kajur <vk250x@att.com> | 2017-05-30 13:37:52 -0400 |
|---|---|---|
| committer | Venkata Harish K Kajur <vk250x@att.com> | 2017-05-30 16:23:41 -0400 |
| commit | 8f3ba2c2b0c877bd7238ced1a472607d36147f0e (patch) | |
| tree | 5d237e63a63df00a9226aec87424eb74495026bb /deploy_vm1.sh | |
| parent | 1f2ae46587874c477bc89f160e382204a3786248 (diff) | |
Fix the typo in the docker tag pull
Change-Id: Ia38e3ca9341da5f35ca02f1f17aa80435763040d
Signed-off-by: Venkata Harish K Kajur <vk250x@att.com>
Diffstat (limited to 'deploy_vm1.sh')
| -rwxr-xr-x | deploy_vm1.sh | 12 |
1 files changed, 6 insertions, 6 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); |