Deploy DLS as user mpetrova

scripts/cloudinit.yml

@@ -29,7 +29,7 @@ users:
       - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCRsldcJ7kiksXTn2hivYfZ+Y9gziBWaMPpfVPNVlPi5XizbMurXAPQ3gUbBTDRp+Plf5LiXAfFNBdPTACb5ymFhIUKj/3sJhxc92uvJktLyjObAZ74ImBzDhVwGzs/cKhWc2otFgyMwrfPuIxdarCiLTjmG+dZ0a+IZbWta241kc3qBPjuqKK/LSZOK/Jx9Dl4rURs780GdcoA7Q2r6I6Bq8m0Cpfl2Otwi5Vr4d6hxWrl8D100ssLctn4FlL4SzVHPyZJVNeFJYQv1boJwldHBST8tJ0r0KC1V5CboB+Rdh1b/Qy1y6l/y9fPX+axFSGIIxSb6egRSwcE89f3kCC1 cboettcher@zam024
 
 
-  - name: maria
+  - name: mpetrova
     gecos: Maria Petrova-El Sayed
     groups: sudo, docker
     shell: /bin/bash
@@ -49,11 +49,11 @@ users:
 
 runcmd:
   - sudo pip3 install docker-compose
-  - cd /home/maria
-  - 'git clone https://gitlab.jsc.fz-juelich.de/eflows4hpc-wp2/data-logistics-service.git ./data-logistics-service'
+  - cd /home/mpetrova
+  - echo "Current user: $(whoami)"
+  - sudo -u mpetrova git clone https://gitlab.jsc.fz-juelich.de/eflows4hpc-wp2/data-logistics-service.git ./data-logistics-service
   - cd ./data-logistics-service
-  - sudo git checkout mptest
-  - cd ..
+  - git checkout mptest #only for testing
   # - mkdir airflow
   # - cd airflow
   # - mkdir -p ./dags ./logs ./plugins ./config ./templates
@@ -72,6 +72,6 @@ runcmd:
   # - echo "Bringing up the docker containers"
   # - docker-compose -f ./dockers/docker-compose.yaml --project-directory ../airflow --verbose up airflow-init
   # - docker-compose -f ./dockers/docker-compose.yaml --project-directory ../airflow up -d
-  - /bin/bash data-logistics-service/scripts/deployment.sh /home/maria /home/maria/data-logistics-service
+  - sudo -u mpetrova /bin/bash data-logistics-service/scripts/deployment.sh /home/mpetrova /home/mpetrova/data-logistics-service
 
 final_message: "The system is finally up, after $UPTIME seconds"
\ No newline at end of file

scripts/deployment.sh

@@ -5,32 +5,34 @@
 # deployment.sh <project_directory> <git_directory> [API_URL] [SERVER_DOMAIN]
 
 OLD_DIR=`pwd`
-GIT_REPO=$OLD_DIR/data-logistics-service
+GIT_REPO=$HOME/data-logistics-service
 
 echo "DEBUG_1 $0 $1 $2 $3 $4"
 
-if [ -z ${1+x} ]; then NEW_DIR=`pwd`; else NEW_DIR=$1; fi
-if [ -z ${2+x} ]; then GIT_REPO else GIT_REPO=$2; fi
+#if null (var + trim empty strings)
+if [ -z ${1+x} ]; then ENTRYPOINT=`pwd`; else ENTRYPOINT=$1; fi
+if [ -z ${2+x} ]; then echo "No user input for starting repository location. Default value: $GIT_REPO"; else GIT_REPO=$2; fi
 # if [ -z ${2+x} ]; then API_URL=https://datacatalog.fz-juelich.de/; else API_URL=$2; fi
 # if [ -z ${3+x} ]; then SERVER_DOMAIN=datacatalog.fz-juelich.de; else SERVER_DOMAIN=$3; fi
 
 echo "DEBUG_2 $0 $1 $2 $3 $4"
-echo "DEBUG values: OLD_DIR=$OLD_DIR, NEW_DIR=$NEW_DIR and GIT_REPO=$GIT_REPO"
+echo "DEBUG values: OLD_DIR=$OLD_DIR, ENTRYPOINT_DIR=$ENTRYPOINT and GIT_REPO=$GIT_REPO"
 
-cd $NEW_DIR
-`mkdir -p airflow`
+cd $ENTRYPOINT
+mkdir -p airflow
 cd airflow
 AIRFLOW_DIR=`pwd`
-echo "Project dir is: $AIRFLOW_DIR"
-echo "User in use is: $(whoami)"
+#DEBUG prints
+echo "Project dir is set to: $AIRFLOW_DIR"
+echo "Proceeding as user: $(whoami)"
 
 # Make the necessary folders for the airflow artefacts and copy the corresponging content
-`mkdir -p ./dags ./logs ./plugins ./config ./templates`
+mkdir -p ./dags ./logs ./plugins ./config ./templates
 cd $GIT_REPO
-`cp dags/* $AIRFLOW_DIR/dags`
-`cp -r plugins/* $AIRFLOW_DIR/plugins`
-`cp config/* $AIRFLOW_DIR/config`
-`cp templates/* $AIRFLOW_DIR/templates`
+cp dags/* $AIRFLOW_DIR/dags
+cp -r plugins/* $AIRFLOW_DIR/plugins
+cp config/* $AIRFLOW_DIR/config
+cp templates/* $AIRFLOW_DIR/templates
 # Setup environment variables and install requirements
 echo -e "AIRFLOW_UID=$(id -u)" > $GIT_REPO/dockers/.env
 export AIRFLOW_UID=$(id -u)