Merge "Verbose task errors logging in deploy.sh"

deploy/deploy.sh

@@ -35,4 +35,13 @@ fi
 ./mcpinstall.py dns
 solar changes stage
 solar changes process
-solar orch run-once -w 1200
+
+SUCCESS_MESSAGE='mcpinstall succeeded'
+ERROR_MESSAGE='mcpinstall encountered an error. Please refer to above message to see detailed error message. Deployment continues.'
+
+if solar orch run-once -w 1200 -s ; then
+    echo $SUCCESS_MESSAGE
+else
+    echo $ERROR_MESSAGE
+    solar orch report -w 120
+fi

resources/os_node/1.0.0/actions/run.sh

@@ -9,6 +9,10 @@ if [[ ! "$os" == "Ubuntu" ]]; then
     sudo hostnamectl set-hostname --static "{{name}}"
 else
     if [[ "$os" == "Ubuntu" ]]; then
+        while fuser /var/lib/dpkg/lock >/dev/null 2>&1; do
+            echo "waiting for dpkg lock"
+            sleep 1
+        done
         sudo apt-get install -y python ansible
         sudo hostname {{name}}
         sudo bash -c  "echo {{name}} > /etc/hostname"