X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=deploy_vm1.sh;h=54d3c797e4e13036760ad13188a88f2deb464b60;hb=c3e6d3471f62d0e521c418f5bd810ecf47405e52;hp=8871a8231dba27101635bad49439706a63663d50;hpb=5e42265ca7ad9521c604a885c6dbd731d3abe61c;p=aai%2Ftest-config.git

diff --git a/deploy_vm1.sh b/deploy_vm1.sh
index 8871a82..54d3c79 100755
--- a/deploy_vm1.sh
+++ b/deploy_vm1.sh
@@ -86,6 +86,23 @@ function wait_for_container() {
     done
 }
 
+function check_if_user_exists(){
+
+        local user_id=$1;
+
+        if [ -z "$user_id" ]; then
+                echo "Needs to provide at least one argument for check_if_user_exists func";
+                exit 1;
+        fi;
+
+        id -u ${user_id} > /dev/null 2>&1 && {
+                echo "1";
+        } || {
+                echo "0";
+        }
+}
+
+
 if [ ! -d "/opt/message-router" ]; then
     (cd /opt && \
         git clone http://gerrit.onap.org/r/dcae/demo/startup/message-router && \
@@ -115,36 +132,17 @@ docker tag $DOCKER_REGISTRY/openecomp/sparky-be:$DOCKER_IMAGE_VERSION $DOCKER_RE
 $DOCKER_COMPOSE_CMD stop
 $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 || {
-
-    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;
+USER_EXISTS=$(check_if_user_exists aaiadmin);
 
-    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 [ "${USER_EXISTS}" -eq 0 ]; then
+        export USER_ID=9000;
+else
+        export USER_ID=$(id -u aaiadmin);
+fi;
 
-    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;
+chown -R $USER_ID:$USER_ID $RESOURCE_LOGS $TRAVERSAL_LOGS;
 
-};
 $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);
@@ -155,7 +153,12 @@ wait_for_container $GRAPH_CONTAINER_NAME '0.0.0.0:8446';
 
 # deploy
 $DOCKER_COMPOSE_CMD up -d aai.api.simpledemo.openecomp.org
+echo "A&AI Microservices, resources and traversal, are up and running along with HAProxy";
 
-docker exec -it $GRAPH_CONTAINER_NAME "/opt/app/aai-traversal/scripts/install/updateQueryData.sh";
+docker exec -it $GRAPH_CONTAINER_NAME "/opt/app/aai-traversal/scripts/install/updateQueryData.sh" && {
+	echo "Successfully loaded the widget related data into db";
+} || {
+	echo "Unable to load widget related data into db";
+}
 
-$DOCKER_COMPOSE_CMD up -d model-loader datarouter
+$DOCKER_COMPOSE_CMD up -d model-loader datarouter aai.searchservice.simpledemo.openecomp.org