Fix the docker image name for data-router

[aai/test-config.git] / deploy_vm1.sh

diff --git a/deploy_vm1.sh b/deploy_vm1.sh
index bf06952..1c1819f 100755 (executable)
--- a/deploy_vm1.sh
+++ b/deploy_vm1.sh
@@ -12,6 +12,7 @@ export TRAVERSAL_LOGS="/opt/aai/logroot/AAI-TRAVERSAL";
 export SEARCH_LOGS="/opt/aai/logroot/AAI-SEARCH";
 export DATA_ROUTER_LOGS="/opt/aai/logroot/AAI-DATA-ROUTER";
 export MODEL_LOADER_LOGS="/opt/aai/logroot/AAI-MODEL-LOADER";
+export UI_LOGS="/opt/aai/logroot/AAI-UI";
 
 if [ ! -d "$RESOURCES_LOGS" ];
 then
@@ -43,6 +44,12 @@ then
     mkdir -p $MODEL_LOADER_LOGS;
 fi;
 
+if [ ! -d "$UI_LOGS" ];
+then
+    echo "Warning: Unable to find the volume directory $UI_LOGS so creating it as regular directory";
+    mkdir -p $UI_LOGS;
+fi;
+
 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:-aaionap/haproxy}";
@@ -95,12 +102,15 @@ docker tag $DOCKER_REGISTRY/openecomp/aai-traversal:$DOCKER_IMAGE_VERSION $DOCKE
 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/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/datarouter-service:latest;
+docker pull ${DOCKER_REGISTRY}/openecomp/data-router:${DOCKER_IMAGE_VERSION};
+docker tag $DOCKER_REGISTRY/openecomp/data-router:$DOCKER_IMAGE_VERSION $DOCKER_REGISTRY/openecomp/data-router:latest;
 
 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;
+
 # cleanup
 $DOCKER_COMPOSE_CMD stop
 $DOCKER_COMPOSE_CMD rm -f -v
@@ -108,8 +118,33 @@ $DOCKER_COMPOSE_CMD rm -f -v
 USER_ID=$(docker run -it --rm --entrypoint=id $DOCKER_REGISTRY/openecomp/aai-resources -u | sed 's/[^0-9]//g')
 GROUP_ID=$(docker run -it --rm --entrypoint=id $DOCKER_REGISTRY/openecomp/aai-resources -g | sed 's/[^0-9]//g')
 
-chown -R $USER_ID:$GROUP_ID $RESOURCES_LOGS;
-chown -R $USER_ID:$GROUP_ID $TRAVERSAL_LOGS;
+chown -R $USER_ID:$GROUP_ID $RESOURCES_LOGS || {
+
+    echo "Unable to change ownership of $RESOURCE_LOGS to $USER_ID:$GROUP_ID" >> /var/tmp/deploy_vm1.log;
+    echo "Trying with sudo now" >> /var/tmp/deploy_vm1.log;
+
+    chown -R 999:999 $RESOURCES_LOGS;
+
+    if [ $? -ne 0 ]; then
+        echo "Unable to change ownership of $RESOURCE_LOGS to 999:999 as well" >> /var/tmp/deploy_vm1.log;
+        sudo chown -R 999:999 $RESOURCE_LOGS;
+    fi;
+
+};
+
+chown -R $USER_ID:$GROUP_ID $TRAVERSAL_LOGS || {
+
+    echo "Unable to change ownership of $TRAVERSAL_LOGS to $USER_ID:$GROUP_ID" >> /var/tmp/deploy_vm1.log;
+    echo "Trying with sudo now" >> /var/tmp/deploy_vm1.log;
+
+    chown -R 999:999 $RESOURCES_LOGS;
+
+    if [ $? -ne 0 ]; then
+        echo "Unable to change ownership of $TRAVERSAL_LOGS to 999:999 as well" >> /var/tmp/deploy_vm1.log;
+        sudo chown -R 999:999 $TRAVERSAL_LOGS;
+    fi;
+
+};
 
 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';