diff options
| -rwxr-xr-x | deploy_vm1.sh | 30 | ||||
| -rwxr-xr-x | deploy_vm2.sh | 9 | ||||
| -rw-r--r-- | docker-compose-db.yml | 9 |
3 files changed, 43 insertions, 5 deletions
diff --git a/deploy_vm1.sh b/deploy_vm1.sh index ba7dfb8..c07b26e 100755 --- a/deploy_vm1.sh +++ b/deploy_vm1.sh @@ -45,9 +45,16 @@ fi; export MTU=${MTU:-1500}; export DOCKER_REGISTRY="${DOCKER_REGISTRY:-localhost:5000}"; -export HBASE_IMAGE="${HBASE_IMAGE:-wc9368/aai-hbase-1.2.3}"; -export GREMLIN_SERVER_IMAGE="${GREMLIN_SERVER_IMAGE:-gremlin-server}"; -export AAI_HAPROXY_IMAGE="${AAI_HAPROXY_IMAGE:-aai-haproxy}"; +export AAI_HAPROXY_IMAGE="${AAI_HAPROXY_IMAGE:-hkajur93/aai-haproxy}"; + +NEXUS_USERNAME=$(cat /opt/config/nexus_username.txt) +NEXUS_PASSWD=$(cat /opt/config/nexus_password.txt) +NEXUS_DOCKER_REPO=$(cat /opt/config/nexus_docker_repo.txt) +DMAAP_TOPIC=$(cat /opt/config/dmaap_topic.txt) +DOCKER_IMAGE_VERSION=$(cat /opt/config/docker_version.txt) +DOCKER_REGISTRY=${NEXUS_DOCKER_REPO} + +docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO function wait_for_container() { @@ -72,6 +79,21 @@ function wait_for_container() { done } +docker pull ${DOCKER_REGISTRY}/openecomp/aai-resources:${DOCKER_IMAGE_VERSION}; +docker tag $DOCKER_REGISTRY/openecomp/aai-resources:$DOCKER_IMAGE_VERSION $DOCKER_REGISTRY/openecomp/aai-resources:latest; + +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 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 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; + # cleanup $DOCKER_COMPOSE_CMD stop $DOCKER_COMPOSE_CMD rm -f -v @@ -92,3 +114,5 @@ wait_for_container $GRAPH_CONTAINER_NAME '0.0.0.0:8446'; $DOCKER_COMPOSE_CMD up -d aai.api.simpledemo.openecomp.org docker exec -it $GRAPH_CONTAINER_NAME "/opt/app/aai-traversal/scripts/install/updateQueryData.sh"; + +$DOCKER_COMPOSE_CMD up -d model-loader datarouter aai.searchservice.simpledemo.openecomp.org diff --git a/deploy_vm2.sh b/deploy_vm2.sh index 01631e3..247653d 100755 --- a/deploy_vm2.sh +++ b/deploy_vm2.sh @@ -44,9 +44,9 @@ then fi; export MTU=${MTU:-1500}; -export HBASE_IMAGE="${HBASE_IMAGE:-wc9368/aai-hbase-1.2.3}"; +export HBASE_IMAGE="${HBASE_IMAGE:-hkajur93/aai-hbase-1.2.3}"; #export HBASE_IMAGE="${HBASE_IMAGE:-harisekhon/hbase}"; -export GREMLIN_SERVER_IMAGE="${GREMLIN_SERVER_IMAGE:-gremlin-server}"; +export GREMLIN_SERVER_IMAGE="${GREMLIN_SERVER_IMAGE:-hkajur93/gremlin-server}"; function wait_for_container() { @@ -71,6 +71,9 @@ function wait_for_container() { done } +docker pull ${HBASE_IMAGE}; +docker pull ${GREMLIN_SERVER_IMAGE}; + # cleanup $DOCKER_COMPOSE_CMD stop $DOCKER_COMPOSE_CMD rm -f -v @@ -81,3 +84,5 @@ wait_for_container $HBASE_CONTAINER_NAME '^starting regionserver'; 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'; + +$DOCKER_COMPOSE_CMD up -d aai.elasticsearch.simpledemo.openecomp.org diff --git a/docker-compose-db.yml b/docker-compose-db.yml index da29fdd..a023378 100644 --- a/docker-compose-db.yml +++ b/docker-compose-db.yml @@ -3,6 +3,15 @@ services: aai.hbase.simpledemo.openecomp.org: image: ${HBASE_IMAGE} hostname: aai.hbase.simpledemo.openecomp.org + ports: + - 50020:50020 + - 2181:2181 + - 16010:16010 + - 50090:50090 + - 16301:16301 + - 50070:50070 + - 50010:50010 + - 50075:50075 logging: driver: "json-file" options: |