From: ARUL NAMBI Date: Fri, 7 Jul 2017 15:51:16 +0000 (-0400) Subject: Adding sparky volume for config X-Git-Tag: 1.0.0-Amsterdam~23 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F15%2F5715%2F1;p=aai%2Ftest-config.git Adding sparky volume for config Change-Id: I73a79c41f3ba689eb3948d8314964215bab1cc33 Signed-off-by: ARUL NAMBI --- diff --git a/deploy_vm1.sh b/deploy_vm1.sh index 379047c..8871a82 100755 --- a/deploy_vm1.sh +++ b/deploy_vm1.sh @@ -109,7 +109,7 @@ docker pull ${DOCKER_REGISTRY}/openecomp/model-loader:${DOCKER_IMAGE_VERSION}; docker tag $DOCKER_REGISTRY/openecomp/model-loader:$DOCKER_IMAGE_VERSION $DOCKER_REGISTRY/openecomp/model-loader:latest; docker pull ${DOCKER_REGISTRY}/openecomp/sparky-be:${DOCKER_IMAGE_VERSION}; -docker tag $DOCKER_REGISTRY/openecomp/sparky-be:$DOCKER_IMAGE_VERSION $DOCKER_REGISTRY/openecomp/sparky:latest; +docker tag $DOCKER_REGISTRY/openecomp/sparky-be:$DOCKER_IMAGE_VERSION $DOCKER_REGISTRY/openecomp/sparky-be:latest; # cleanup $DOCKER_COMPOSE_CMD stop @@ -145,6 +145,7 @@ chown -R $USER_ID:$GROUP_ID $TRAVERSAL_LOGS || { fi; }; +$DOCKER_COMPOSE_CMD up -d sparky-be 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'; @@ -157,4 +158,4 @@ $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 sparky datarouter aai.searchservice.simpledemo.openecomp.org +$DOCKER_COMPOSE_CMD up -d model-loader datarouter diff --git a/docker-compose-app.yml b/docker-compose-app.yml index f559945..4ba5b4c 100644 --- a/docker-compose-app.yml +++ b/docker-compose-app.yml @@ -105,12 +105,12 @@ services: max-size: "30m" max-file: "5" - aai.ui.simpledemo.openecomp.org: - image: ${DOCKER_REGISTRY}/openecomp/aai-ui - hostname: aai.ui.simpledemo.openecomp.org + sparky-be: + image: ${DOCKER_REGISTRY}/openecomp/sparky-be + hostname: sparky-be volumes: - ${UI_LOGS}:/logs - - /opt/app/sparky/appconfig:/opt/app/UI_LOGS/config + - /opt/test-config/sparky/appconfig:/opt/app/sparky/config ports: - 9517:9517 environment: diff --git a/sparky/appconfig/auth/inventory-ui-keystore b/sparky/appconfig/auth/inventory-ui-keystore new file mode 100644 index 0000000..efa01f8 Binary files /dev/null and b/sparky/appconfig/auth/inventory-ui-keystore differ