2 files changed, 14 insertions, 2 deletions

diff --git a/files/clever-wait-deploy.sh b/files/clever-wait-deploy.sh
index 99088cc..c955f6a 100644
--- a/files/clever-wait-deploy.sh
+++ b/files/clever-wait-deploy.sh
@@ -32,7 +32,7 @@ function check {
   done
 
   # Wait for completion
-  echo "Deployement in progress..."
+  echo "Deployment in progress..."
   while deploying "$commit" -a $timeout -gt 0
   do
     sleep $samplingTime
diff --git a/tasks/deploy.yml b/tasks/deploy.yml
index 8b98d8c..54c04ac 100644
--- a/tasks/deploy.yml
+++ b/tasks/deploy.yml
@@ -24,7 +24,19 @@
 - name: Push to Clever-Cloud to trigger deployment
   command: "git push --force git+ssh://git@push-par-clevercloud-customers.services.clever-cloud.com/{{ clever_app }}.git HEAD:refs/heads/master"
 
-- name: Wait until deployment completion
+- name: Watch deployment status
   command: clever-wait-deploy.sh
+  async: 900
+  poll: 0
+  register: long_command
   environment:
     CONFIGURATION_FILE: "{{ clever_login_file }}"
+
+# Waits up to 15 minutes
+- name: Wait for deployment completion
+  async_status:
+    jid: "{{ long_command.ansible_job_id }}"
+  register: job_result
+  until: job_result.finished
+  delay: 30
+  retries: 30